Skip to content

Commit

Permalink
Merge pull request #94 from filecoin-project/master-upgrade
Browse files Browse the repository at this point in the history
upgrade@12818380146
  • Loading branch information
galargh authored Jan 16, 2025
2 parents dc1bfd2 + 59ac080 commit 0e62497
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/fix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ jobs:
run: node lib/actions/fix-yaml-config.js
working-directory: scripts
- name: Upload YAML config
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ${{ env.TF_WORKSPACE }}.yml
path: github/${{ env.TF_WORKSPACE }}.yml
Expand Down Expand Up @@ -152,7 +152,7 @@ jobs:
with:
path: base
- name: Download YAML configs
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
path: artifacts
- name: Copy YAML configs
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/plan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ jobs:
terraform plan -refresh=false -lock=false -out="${TF_WORKSPACE}.tfplan" -no-color
working-directory: terraform
- name: Upload terraform plan
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ${{ env.TF_WORKSPACE }}_${{ github.event.pull_request.head.sha || github.sha }}.tfplan
path: terraform/${{ env.TF_WORKSPACE }}.tfplan
Expand Down Expand Up @@ -130,7 +130,7 @@ jobs:
run: terraform init
working-directory: terraform
- name: Download terraform plans
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
path: terraform
- name: Show terraform plans
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- workflows: not to use deprecated GitHub Actions expressions anymore
- tf: to prevent destroy of membership and repository resources
- apply: find sha for plan using proper credentials
- updated upload and download artifacts actions to v4

### Fixed
- links to supported resources in HOWTOs
Expand Down
2 changes: 1 addition & 1 deletion docs/HOWTOS.md
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ I push my changes to a new branch and create a PR. An admin reviews the PR and m

### ...synchronize GitHub Management with GitHub?

*NOTE*: Remember that the `Sync` operation modifies terraform state. Even if you run it from a branch, it modifies the global state that is shared with other branches. There is only one terraform state per organization.
*NOTE*: Remember that the `Sync` operation modifes terraform state. Even if you run it from a branch, it modifies the global state that is shared with other branches. There is only one terraform state per organization.

*NOTE*: `Sync` will force push changes directly to the branch you run it from.

Expand Down
2 changes: 1 addition & 1 deletion docs/SETUP.md
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@
- [ ] Manually set values that are impossible to control this value via terraform currently
- [ ] [Set read repository contents permissions for `GITHUB_TOKEN`](https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/enabling-features-for-your-repository/managing-github-actions-settings-for-a-repository#setting-the-permissions-of-the-github_token-for-your-repository)
- [ ] If the repository is public, [require approval for all outside collaborators](https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/enabling-features-for-your-repository/managing-github-actions-settings-for-a-repository#configuring-required-approval-for-workflows-from-public-forks)
- [ ] If the repository is private, [disable sending write tokens or secrets to workflows from fork pull requests](https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/enabling-features-for-your-repository/managing-github-actions-settings-for-a-repository#enabling-workflows-for-private-repository-forks)
- [ ] If the repository is private, [disable sending write tokens or secrets to worfklows from fork pull requests](https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/enabling-features-for-your-repository/managing-github-actions-settings-for-a-repository#enabling-workflows-for-private-repository-forks)
- [ ] Pull remote changes to the default branch
- [ ] Enable required PRs, peer reviews, status checks and branch up-to-date check on the repository by making sure [github/$ORGANIZATION_NAME.yml](github/$ORGANIZATION_NAME.yml) contains the following entry:
```yaml
Expand Down

0 comments on commit 0e62497

Please sign in to comment.