5
0
Fork 0
mirror of https://github.com/hashicorp/vault-action.git synced 2025-11-07 15:16:56 +00:00

Update default branch

This commit is contained in:
Tom Proctor 2022-04-28 11:24:54 +01:00
parent fd9b31c94c
commit 4f536680b6
No known key found for this signature in database
GPG key ID: 9AA1838744D16345
4 changed files with 8 additions and 8 deletions

View file

@ -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. A clear and concise description of what you expected to happen.
**Log Output** **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** **Additional context**
Add any other context about the problem here. Add any other context about the problem here.

View file

@ -1,7 +1,7 @@
on: on:
push: push:
branches: branches:
- master - main
pull_request_target: pull_request_target:
types: [opened, reopened, synchronize] types: [opened, reopened, synchronize]
workflow_dispatch: workflow_dispatch:
@ -264,7 +264,7 @@ jobs:
# Removing publish step for now. # Removing publish step for now.
# publish: # publish:
# if: github.event_name == 'push' && contains(github.ref, 'master') # if: github.event_name == 'push' && contains(github.ref, 'main')
# runs-on: ubuntu-latest # runs-on: ubuntu-latest
# needs: [build, integration, e2e] # needs: [build, integration, e2e]
# steps: # steps:
@ -282,7 +282,7 @@ jobs:
# - name: npm install # - name: npm install
# run: npm ci # run: npm ci
# - name: release # - name: release
# if: success() && endsWith(github.ref, 'master') # if: success() && endsWith(github.ref, 'main')
# run: npx semantic-release # run: npx semantic-release
# env: # env:
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

View file

@ -26,9 +26,9 @@ function mockGithubOIDCResponse(aud= "https://github.com/hashicorp/vault-action"
const now = rsasign.KJUR.jws.IntDate.getNow(); const now = rsasign.KJUR.jws.IntDate.getNow();
const payload = { const payload = {
jti: "unique-id", jti: "unique-id",
sub: "repo:hashicorp/vault-action:ref:refs/heads/master", sub: "repo:hashicorp/vault-action:ref:refs/heads/main",
aud, aud,
ref: "refs/heads/master", ref: "refs/heads/main",
sha: "commit-sha", sha: "commit-sha",
repository: "hashicorp/vault-action", repository: "hashicorp/vault-action",
repository_owner: "hashicorp", repository_owner: "hashicorp",
@ -41,7 +41,7 @@ function mockGithubOIDCResponse(aud= "https://github.com/hashicorp/vault-action"
base_ref: "", base_ref: "",
event_name: "push", event_name: "push",
ref_type: "branch", 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', iss: 'vault-action',
iat: now, iat: now,
nbf: now, nbf: now,

View file

@ -16,7 +16,7 @@
"dist/**/*" "dist/**/*"
], ],
"release": { "release": {
"branch": "master", "branch": "main",
"plugins": [ "plugins": [
"@semantic-release/commit-analyzer", "@semantic-release/commit-analyzer",
"@semantic-release/release-notes-generator", "@semantic-release/release-notes-generator",