From c897a6c963a199b719d3145d169028c8a96ee41e Mon Sep 17 00:00:00 2001 From: Pavel Vetokhin Date: Sun, 18 Feb 2024 18:52:19 +0300 Subject: [PATCH 1/2] Configure composite action explicitly --- .github/actions/setup-gear/action.yaml | 11 +++++++++++ .github/dependabot.yaml | 4 ++++ .github/workflows/beyond-doubt.yaml | 4 ---- .github/workflows/convincing.yaml | 2 -- .github/workflows/sanity.yaml | 2 -- 5 files changed, 15 insertions(+), 8 deletions(-) diff --git a/.github/actions/setup-gear/action.yaml b/.github/actions/setup-gear/action.yaml index 1af9d006..1ecdab42 100644 --- a/.github/actions/setup-gear/action.yaml +++ b/.github/actions/setup-gear/action.yaml @@ -31,3 +31,14 @@ runs: registry: ghcr.io username: ${{ github.actor }} password: ${{ inputs.token }} + # for the sake of maven setup & dependency caching + - uses: actions/setup-java@v4.0.0 + with: + distribution: 'temurin' + java-version: '21' + check-latest: false + cache: 'maven' + cache-dependency-path: | + pom.xml + lib/pom.xml + tool/pom.xml diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml index 7a2ea3d3..a6d40c66 100644 --- a/.github/dependabot.yaml +++ b/.github/dependabot.yaml @@ -17,6 +17,10 @@ updates: directory: "/" schedule: interval: "weekly" + - package-ecosystem: "github-actions" + directory: "/actions/setup-gear" + schedule: + interval: "weekly" - package-ecosystem: "docker" directory: "/db/postgres" schedule: diff --git a/.github/workflows/beyond-doubt.yaml b/.github/workflows/beyond-doubt.yaml index 61393a32..fe846adc 100644 --- a/.github/workflows/beyond-doubt.yaml +++ b/.github/workflows/beyond-doubt.yaml @@ -34,8 +34,6 @@ jobs: with: devenv: ${{ matrix.env.dev }} token: ${{ secrets.GITHUB_TOKEN }} - - name: Run setup-maven - uses: ./.github/actions/setup-maven - name: Run ansible-playbook sources.yaml run: >- docker run --rm @@ -151,8 +149,6 @@ jobs: with: name: product-${{ matrix.purpose }}-${{ matrix.env.ops }} path: stack/product/target/image-context - - name: Run setup-maven - uses: ./.github/actions/setup-maven - name: Run ansible-playbook stacks.yaml -t test run: >- docker run --rm diff --git a/.github/workflows/convincing.yaml b/.github/workflows/convincing.yaml index 38a49f4e..7f3bd1ec 100644 --- a/.github/workflows/convincing.yaml +++ b/.github/workflows/convincing.yaml @@ -30,8 +30,6 @@ jobs: with: devenv: ${{ matrix.env.dev }} token: ${{ secrets.GITHUB_TOKEN }} - - name: Run setup-maven - uses: ./.github/actions/setup-maven - name: Run ansible-playbook sources.yaml run: >- docker run --rm diff --git a/.github/workflows/sanity.yaml b/.github/workflows/sanity.yaml index 0c62ec49..8ff9cbca 100644 --- a/.github/workflows/sanity.yaml +++ b/.github/workflows/sanity.yaml @@ -30,8 +30,6 @@ jobs: with: devenv: ${{ matrix.env.dev }} token: ${{ secrets.GITHUB_TOKEN }} - - name: Run setup-maven - uses: ./.github/actions/setup-maven - name: Run ansible-playbook sources.yaml run: >- docker run --rm From f7376e1078d4b6bf44d8f20c6988d3a37f7b75a5 Mon Sep 17 00:00:00 2001 From: Pavel Vetokhin Date: Sun, 18 Feb 2024 18:59:25 +0300 Subject: [PATCH 2/2] Remove setup-maven --- .github/actions/setup-maven/action.yaml | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 .github/actions/setup-maven/action.yaml diff --git a/.github/actions/setup-maven/action.yaml b/.github/actions/setup-maven/action.yaml deleted file mode 100644 index 7e99f85f..00000000 --- a/.github/actions/setup-maven/action.yaml +++ /dev/null @@ -1,18 +0,0 @@ ---- -name: Setup Maven -description: Settings & caching -runs: - using: "composite" - steps: - - uses: actions/setup-java@v4.0.0 - with: - distribution: 'temurin' - java-version: '21' # no matter - check-latest: false - cache: 'maven' - cache-dependency-path: | - pom.xml - lib/pom.xml - tool/pom.xml - - shell: bash - run: cat ~/.m2/settings.xml