From 97fca810df1d23e59e1ea13967cbd9b78f50b0fd Mon Sep 17 00:00:00 2001 From: Guillaume Nodet Date: Tue, 3 Oct 2023 13:53:26 +0200 Subject: [PATCH] Simplify CI --- .github/workflows/master-build.yml | 31 +++--------------------------- .travis.yml | 22 --------------------- appveyor.yml | 23 ---------------------- 3 files changed, 3 insertions(+), 73 deletions(-) delete mode 100644 .travis.yml delete mode 100644 appveyor.yml diff --git a/.github/workflows/master-build.yml b/.github/workflows/master-build.yml index 56e0fce62..bd72f85e5 100644 --- a/.github/workflows/master-build.yml +++ b/.github/workflows/master-build.yml @@ -30,8 +30,8 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ ubuntu-latest, windows-latest ] - java: [ '11' ] + os: [ ubuntu-latest, windows-latest, macos-latest ] + java: [ '11', '21' ] steps: - uses: actions/checkout@v2 @@ -48,29 +48,4 @@ jobs: ${{ matrix.os }}-maven- - name: Build with maven - run: mvn --activate-profiles ci --no-transfer-progress package -DskipTests - - test: - needs: compile - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [ ubuntu-latest, windows-latest ] - java: [ '1.8', '11', '17' ] - steps: - - uses: actions/checkout@v2 - - - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v1 - with: - java-version: ${{ matrix.java }} - - - uses: actions/cache@v1 - with: - path: ~/.m2/repository - key: ${{ matrix.os }}-maven-${{ hashFiles('**/pom.xml') }} - restore-keys: | - ${{ matrix.os }}-maven- - - - name: Build with maven - run: mvn --activate-profiles ci --no-transfer-progress package + run: mvn --no-transfer-progress verify diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 03fb524cc..000000000 --- a/.travis.yml +++ /dev/null @@ -1,22 +0,0 @@ -language: java - -sudo: false - -env: - global: - - secure: 'PajKlInMvlkhMNFPSvwgOr8GnvQ/1/uAm+ZVbFCFW3CS40CdaSwCT5vWiyENoQsbAjXMVHFzpUSIHjXpLCA7jl3c0AM1uzjXTsQGtFVyxLPn1f7K0ePy0g3EKZPka4SGVpSG0GwW6kfWVfPNPDEIZJM0ZQRvta4/aOAldFzcb9X7hKjM2H4PbgYEhVfNP50QGsuonZf7PLu4Bl5bNH8wXIGn5iNGPauYa/mlFsI5Gsar0F4PJaVd7efszh+lPAHUaW/DUpoN0S9gM18tC28R7OIDvuniFPzIWVPm2P0aIYAktVf+GVTgACzuL7/D6OhxEyyCTqdet2jMFFkP1wcEvugPsArkZRPeqwuA+2XXV9amWvvSopkMJIkad6TnfK+zfVkMH0vXa/cu/a/5WPE2QS5VhCXocVze3sOUlncifxftd57kENley29+K57K4BWhxtsb/Uh1nvUpxgXnodgWQ7M5i0e4/iX14oVjCic1VDIUYFagGl1texVJ1jTsvflO2LEozof0f+ZTK1r7xRKabIj4YOugA5dz658ZdjZrds5n88Uv6KVD1T2ixhhnPVxeimpHdu5j43G9P7nR7T/n/nl50CsTOtS7Hnrh6KdUGMvBm42nFKra9nyInea5kwkMhHu182+01t+jYF3y/TIeU55nGjiXJPEf/pQK6nzxDV8=' - - secure: 'HqKdgQbxwuP0HkTzklTofLU4Wv7a1uM1BU5B0C7Hk7JuEmMBH0iC6VcyWd6C2zQgm1jRqZ6Dly9t7iwtmR7eDdOSpA0X2LsZuZZMuYzrQVW9M7i8qzNECl80UvOKnEiqlQD2qxUDCp+hX0UiOuAF4DX9upIo7SMplWYdsDHWpcIRz+b5HUMnnS32gBaHZ2Y02FS5LMOI9HV0UdPXSwTI4LzrztAYEj8yGn8inYwOTD5JTC9rF8It58zCtRJ1e9cM7BINOa8Ri0TpVOJGJlze9oNKEKnBS+zTRCphsBlomkyNBxknm86yXr0smGqiMp4wqrG8G45JNN7034koU5b+m796sf6fFFV8rEdkQDdkrbBSFlDwEuFc+yWDFhDJqQCJRKbBfL+n2tJJAyLse/OtrYvizdMrBX1tnhp/lrBEVa3GrtCa1B5a3XrV20sdowLveQERnMPfJDcTKP60FB6lQIAHg/yNjSFV84SmHrisMIH6xbkZHZsh50foUlo73XaGRa8XhBOTcJ9Gh6pwcrNLv4rCUv4UE+CV7AUC90jEnbHrJbHtbCo/QOJgQ7cT83kzA7iP3JDppO79MV/6QfEHqRNTt/XkzhIt+PrGfUakTNe32lB6uFni+jv8/xyjGsgFDjOJqWoWIDUCjUTYrjx3iv702Q0dQLrau05eEuzf53g=' - - MAVEN_SETTINGS='.travis/settings.xml' - - MAVEN_OPTIONS="-V -B -s $MAVEN_SETTINGS" - -branches: - only: - - master - -jdk: - - openjdk8 - -# FIXME: for now just complain; do not fail as the present license headers have inconsistent date ranges -install: ./build ci-prepare -Dlicense.failIfMissing=false $MAVEN_OPTIONS - -script: ./build ci-build $MAVEN_OPTIONS diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index 660d7154d..000000000 --- a/appveyor.yml +++ /dev/null @@ -1,23 +0,0 @@ -version: '{build}' -os: Windows Server 2012 -install: - - ps: | - Add-Type -AssemblyName System.IO.Compression.FileSystem - if (!(Test-Path -Path "C:\maven" )) { - (new-object System.Net.WebClient).DownloadFile( - 'https://archive.apache.org/dist/maven/maven-3/3.8.7/binaries/apache-maven-3.8.7-bin.zip', - 'C:\maven-bin.zip' - ) - [System.IO.Compression.ZipFile]::ExtractToDirectory("C:\maven-bin.zip", "C:\maven") - } - - cmd: SET M2_HOME=C:\maven\apache-maven-3.8.7 - - cmd: SET PATH=%M2_HOME%\bin;%JAVA_HOME%\bin;%PATH% - - cmd: SET MAVEN_OPTS=-XX:MaxPermSize=2g -Xmx4g - - cmd: SET JAVA_OPTS=-XX:MaxPermSize=2g -Xmx4g -build_script: - - mvn clean package --batch-mode -DskipTests -test_script: - - mvn clean install --batch-mode -cache: - - C:\maven\ - - C:\Users\appveyor\.m2