Skip to content

Commit

Permalink
Resolve conflicts on GH Actions.
Browse files Browse the repository at this point in the history
  • Loading branch information
cliffano committed Mar 14, 2024
1 parent e4b7701 commit e92be8e
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 24 deletions.
7 changes: 1 addition & 6 deletions .github/workflows/ci-workflow.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,8 @@ jobs:
steps:
- uses: actions/checkout@v4
with:
<<<<<<< Updated upstream
token: ${{ secrets.STUDIO_GITHUB_TOKEN }}
- uses: actions/setup-node@v4
=======
token: ${{ secrets.OAPICF_GITHUB_TOKEN }}
- uses: actions/setup-node@v1
>>>>>>> Stashed changes
- uses: actions/setup-node@v4
with:
node-version: '20'
- uses: ./.github/actions/ci-action
Expand Down
7 changes: 1 addition & 6 deletions .github/workflows/release-major-workflow.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,8 @@ jobs:
steps:
- uses: actions/checkout@v4
with:
<<<<<<< Updated upstream
token: ${{ secrets.STUDIO_GITHUB_TOKEN }}
- uses: actions/setup-node@v4
=======
token: ${{ secrets.OAPICF_GITHUB_TOKEN }}
- uses: actions/setup-node@v1
>>>>>>> Stashed changes
- uses: actions/setup-node@v4
with:
node-version: '20'
- run: git config --global user.email "[email protected]"
Expand Down
7 changes: 1 addition & 6 deletions .github/workflows/release-minor-workflow.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,8 @@ jobs:
steps:
- uses: actions/checkout@v4
with:
<<<<<<< Updated upstream
token: ${{ secrets.STUDIO_GITHUB_TOKEN }}
- uses: actions/setup-node@v4
=======
token: ${{ secrets.OAPICF_GITHUB_TOKEN }}
- uses: actions/setup-node@v1
>>>>>>> Stashed changes
- uses: actions/setup-node@v4
with:
node-version: '20'
- run: git config --global user.email "[email protected]"
Expand Down
7 changes: 1 addition & 6 deletions .github/workflows/release-patch-workflow.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,8 @@ jobs:
steps:
- uses: actions/checkout@v4
with:
<<<<<<< Updated upstream
token: ${{ secrets.STUDIO_GITHUB_TOKEN }}
- uses: actions/setup-node@v4
=======
token: ${{ secrets.OAPICF_GITHUB_TOKEN }}
- uses: actions/setup-node@v1
>>>>>>> Stashed changes
- uses: actions/setup-node@v4
with:
node-version: '20'
- run: git config --global user.email "[email protected]"
Expand Down

0 comments on commit e92be8e

Please sign in to comment.