diff --git a/.github/workflows/jberet-1.x.yml b/.github/workflows/jberet-1.4.x.yml similarity index 96% rename from .github/workflows/jberet-1.x.yml rename to .github/workflows/jberet-1.4.x.yml index c031c3acc..67a5a62cc 100644 --- a/.github/workflows/jberet-1.x.yml +++ b/.github/workflows/jberet-1.4.x.yml @@ -1,14 +1,15 @@ # This workflow will build a Java project with Maven # For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven -name: JBeret 1.x +name: JBeret 1.4.x on: pull_request: branches: - - 1.* + - 1.4.x types: [ opened, synchronize, reopened, ready_for_review ] - + push: + branches: [ 1.4.x ] jobs: build-test-matrix: name: ${{ matrix.jdk-distribution }}-${{ matrix.jdk-version }}-${{ matrix.os }} diff --git a/.github/workflows/jberet-2.x.yml b/.github/workflows/jberet-2.x.yml deleted file mode 100644 index 903d9b93e..000000000 --- a/.github/workflows/jberet-2.x.yml +++ /dev/null @@ -1,48 +0,0 @@ -# This workflow will build a Java project with Maven -# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven - -name: JBeret - -on: - pull_request: - branches: - - master - - 2.* - types: [ opened, synchronize, reopened, ready_for_review ] - -jobs: - build-test-matrix: - name: ${{ matrix.jdk-distribution }}-${{ matrix.jdk-version }}-${{ matrix.os }} - runs-on: ${{ matrix.os }} - timeout-minutes: 15 - strategy: - fail-fast: false - matrix: - os: [ macos-latest, windows-latest ] - jdk-distribution: [ temurin ] - jdk-version: [ 11 ] - steps: - - name: Configure runner - Linux - if: contains(matrix.os, 'macos') - run: | - sudo bash -c "echo '127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4' > /etc/hosts" - sudo bash -c "echo '::1 localhost localhost.localdomain localhost6 localhost6.localdomain6' >> /etc/hosts" - - name: Configure Runner - Windows - if: contains(matrix.os, 'windows') - run: | - echo '127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4' > %SystemRoot%\System32\drivers\etc\hosts - echo '::1 localhost localhost.localdomain localhost6 localhost6.localdomain6' >> %SystemRoot%\System32\drivers\etc\hosts - shell: cmd - - uses: actions/checkout@v3 - - name: Set up JDK ${{ matrix.jdk-distribution }} ${{ matrix.jdk-version }} - uses: actions/setup-java@v3 - with: - distribution: ${{ matrix.jdk-distribution }} - java-version: ${{ matrix.jdk-version }} - - name: Run Tests - run: mvn -ntp -U -B -fae clean install - - uses: actions/upload-artifact@v3 - if: failure() - with: - name: surefire-${{ matrix.jdk-distribution }}-${{ matrix.jdk-version }}-${{ matrix.os }} - path: '**/surefire-reports/*.txt'