From c03bbe83a876bdf269edecc9bf5d77769cab964f Mon Sep 17 00:00:00 2001 From: Henri Koski Date: Wed, 4 Dec 2024 17:41:43 +0200 Subject: [PATCH] Fix working dir --- .github/workflows/default.yaml | 6 +++--- .github/workflows/pr.yaml | 7 +++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/default.yaml b/.github/workflows/default.yaml index dff5a38..7e3c364 100644 --- a/.github/workflows/default.yaml +++ b/.github/workflows/default.yaml @@ -8,7 +8,7 @@ on: defaults: run: working-directory: ./v2 - + jobs: analyze: runs-on: elisa-normal @@ -23,7 +23,7 @@ jobs: - uses: elisa-actions/setup-go-and-mage@v1 with: - modFile: ./v2/go.mod + modFile: go.mod - name: Verify dependencies run: mage go:tidyAndVerify @@ -36,7 +36,7 @@ jobs: with: url: https://codecov.csf.elisa.fi flags: unit - files: ./v2/target/tests/cover/unit/cover.txt + files: v2/target/tests/cover/unit/cover.txt use_oidc: true - name: Lint diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 6d01a72..4452c00 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -25,7 +25,7 @@ jobs: - uses: elisa-actions/setup-go-and-mage@v1 with: - modFile: ./v2/go.mod + modFile: go.mod - name: Verify dependencies run: mage go:tidyAndVerify @@ -38,7 +38,7 @@ jobs: with: url: https://codecov.csf.elisa.fi flags: unit - files: ./v2/target/tests/cover/unit/cover.txt + files: v2/target/tests/cover/unit/cover.txt use_oidc: true - name: Lint @@ -55,8 +55,7 @@ jobs: github.event.pull_request.user.login == 'dops-sre' steps: - name: Automerge dependabot and repo-updater PR's - run: gh pr merge --auto --merge "$PR_URL" + run: cd .. && gh pr merge --auto --merge "$PR_URL" env: PR_URL: ${{github.event.pull_request.html_url}} GH_TOKEN: ${{ secrets.DOPS_SRE_PAT }} -