diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index db66f19..b6133e3 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -17,7 +17,7 @@ The yaml of the `vault-action` step, with any sensitive information masked or re A clear and concise description of what you expected to happen. **Log Output** -For the most verbose logs, [add a secret called `ACTIONS_STEP_DEBUG` with the value `true`](https://github.com/actions/toolkit/blob/master/docs/action-debugging.md). Then, re-run the workflow if possible and post the *raw logs* for the step here with any sensitive information masked or removed. +For the most verbose logs, [add a secret called `ACTIONS_STEP_DEBUG` with the value `true`](https://github.com/actions/toolkit/blob/main/docs/action-debugging.md). Then, re-run the workflow if possible and post the *raw logs* for the step here with any sensitive information masked or removed. **Additional context** Add any other context about the problem here. diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5760c29..f4fa57b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,7 +1,7 @@ on: push: branches: - - master + - main pull_request_target: types: [opened, reopened, synchronize] workflow_dispatch: @@ -264,7 +264,7 @@ jobs: # Removing publish step for now. # publish: -# if: github.event_name == 'push' && contains(github.ref, 'master') +# if: github.event_name == 'push' && contains(github.ref, 'main') # runs-on: ubuntu-latest # needs: [build, integration, e2e] # steps: @@ -282,7 +282,7 @@ jobs: # - name: npm install # run: npm ci # - name: release -# if: success() && endsWith(github.ref, 'master') +# if: success() && endsWith(github.ref, 'main') # run: npx semantic-release # env: # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/integrationTests/basic/jwt_auth.test.js b/integrationTests/basic/jwt_auth.test.js index 505bcad..5e50f6c 100644 --- a/integrationTests/basic/jwt_auth.test.js +++ b/integrationTests/basic/jwt_auth.test.js @@ -26,9 +26,9 @@ function mockGithubOIDCResponse(aud= "https://github.com/hashicorp/vault-action" const now = rsasign.KJUR.jws.IntDate.getNow(); const payload = { jti: "unique-id", - sub: "repo:hashicorp/vault-action:ref:refs/heads/master", + sub: "repo:hashicorp/vault-action:ref:refs/heads/main", aud, - ref: "refs/heads/master", + ref: "refs/heads/main", sha: "commit-sha", repository: "hashicorp/vault-action", repository_owner: "hashicorp", @@ -41,7 +41,7 @@ function mockGithubOIDCResponse(aud= "https://github.com/hashicorp/vault-action" base_ref: "", event_name: "push", ref_type: "branch", - job_workflow_ref: "hashicorp/vault-action/.github/workflows/workflow.yml@refs/heads/master", + job_workflow_ref: "hashicorp/vault-action/.github/workflows/workflow.yml@refs/heads/main", iss: 'vault-action', iat: now, nbf: now, diff --git a/package.json b/package.json index 8a5fdc3..55ec436 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "dist/**/*" ], "release": { - "branch": "master", + "branch": "main", "plugins": [ "@semantic-release/commit-analyzer", "@semantic-release/release-notes-generator",