From 2bc328b79b4480cdf89a1337946e0323b5a164d4 Mon Sep 17 00:00:00 2001 From: CarstenHollmann Date: Wed, 26 Oct 2022 08:36:43 +0200 Subject: [PATCH] update actions to merge v10 into master and v9 into maintenance --- .github/dependabot.yml | 11 +---------- .github/workflows/daily.yml | 8 ++++---- .github/workflows/pull.yml | 4 ++-- .github/workflows/push.yml | 8 ++++---- 4 files changed, 11 insertions(+), 20 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index c7a3b4043..fc7617329 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -10,22 +10,13 @@ updates: - dependency-name: xml-apis:xml-apis versions: - ">= 2.a, < 3" - - dependency-name: org.elasticsearch.client:elasticsearch-rest-high-level-client - versions: - - 7.11.0 - - dependency-name: org.elasticsearch.client:elasticsearch-rest-client - versions: - - 7.11.0 - - dependency-name: org.elasticsearch:elasticsearch - versions: - - 7.11.0 - package-ecosystem: maven directory: "/" schedule: interval: daily time: "04:15" open-pull-requests-limit: 10 - target-branch: "version/v10.0" + target-branch: "maintenance/9.x" ignore: - dependency-name: xml-apis:xml-apis versions: diff --git a/.github/workflows/daily.yml b/.github/workflows/daily.yml index df7870d1a..e0d2c9f73 100644 --- a/.github/workflows/daily.yml +++ b/.github/workflows/daily.yml @@ -7,7 +7,7 @@ on: jobs: build-java-8: - if: github.ref != 'refs/heads/version/v10.0' + if: github.ref == 'refs/heads/maintenance/*' runs-on: ubuntu-latest name: Java 8 compile @@ -22,7 +22,7 @@ jobs: - name: Build with Maven run: mvn -U -B clean install build-java-11: - if: github.ref == 'refs/heads/version/v10.0' + if: github.ref != 'refs/heads/maintenance/*' runs-on: ubuntu-latest name: Java 11 compile @@ -38,7 +38,7 @@ jobs: run: mvn -U -B clean install publish-snapshot-java-8: - if: github.ref != 'refs/heads/version/v10.0' + if: github.ref == 'refs/heads/maintenance/*' needs: build-java-8 runs-on: ubuntu-latest @@ -59,7 +59,7 @@ jobs: MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }} publish-snapshot-java-11: - if: github.ref == 'refs/heads/version/v10.0' + if: github.ref != 'refs/heads/maintenance/*' needs: build-java-11 runs-on: ubuntu-latest diff --git a/.github/workflows/pull.yml b/.github/workflows/pull.yml index 0d26d3045..4387fa89e 100644 --- a/.github/workflows/pull.yml +++ b/.github/workflows/pull.yml @@ -7,7 +7,7 @@ on: jobs: build-java-8: - if: github.ref != 'refs/heads/version/v10.0' + if: github.ref == 'refs/heads/maintenance/*' strategy: matrix: java: [ 8, 11, 17 ] @@ -25,7 +25,7 @@ jobs: - name: Build with Maven run: mvn -U -B clean install build-java-11: - if: github.ref == 'refs/heads/version/v10.0' + if: github.ref != 'refs/heads/version/v10.0' strategy: matrix: java: [ 11, 17 ] diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 57f285fff..17973d602 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -6,7 +6,7 @@ on: jobs: build-java-8: - if: github.ref != 'refs/heads/version/v10.0' + if: github.ref == 'refs/heads/maintenance/*' strategy: matrix: java: [ 8, 11, 17 ] @@ -24,7 +24,7 @@ jobs: - name: Build with Maven run: mvn -fae -U -B clean install -P check build-java-11: - if: github.ref == 'refs/heads/version/v10.0' + if: github.ref != 'refs/heads/maintenance/*' strategy: matrix: java: [ 11, 17 ] @@ -43,7 +43,7 @@ jobs: run: mvn -fae -U -B clean install -P check publish-snapshot-java-8: - if: github.ref != 'refs/heads/version/v10.0' + if: github.ref == 'refs/heads/maintenance/*' needs: build-java-8 runs-on: ubuntu-latest @@ -64,7 +64,7 @@ jobs: MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }} publish-snapshot-java-11: - if: github.ref == 'refs/heads/version/v10.0' + if: github.ref != 'refs/heads/maintenance/*' needs: build-java-11 runs-on: ubuntu-latest