Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/scripts/npm-package.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const pkg = require('../../package.json');

const projectRoot = path.join(__dirname, '..', '..');

const npmrc = '//registry.npmjs.org/:_authToken=${NODE_AUTH_TOKEN}\nalways-auth=true';
const npmrc = '//registry.npmjs.org/:_authToken=${NODE_AUTH_TOKEN}';

async function main() {
// force pwd to at .../cactbot/
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/build-artifact.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
msbuild:
runs-on: windows-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6

- uses: ./.github/actions/setup-js-env

Expand All @@ -43,7 +43,7 @@ jobs:

- name: Check dependencies cache
id: cache-dependencies
uses: actions/cache@v4
uses: actions/cache@v5
with:
path: ./plugin/ThirdParty
key: |
Expand All @@ -57,7 +57,7 @@ jobs:
npm run fetch-deps

- name: Set up msbuild
uses: microsoft/setup-msbuild@v1
uses: microsoft/setup-msbuild@v3

- name: Add Custom Problem Matcher
run: |
Expand All @@ -76,7 +76,7 @@ jobs:
run: ./util/publish.sh

- name: Upload artifact
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: cactbot-${{ env.artifact_sha }}
path: publish/cactbot-release/
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/css-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
stylelint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6

- uses: ./.github/actions/setup-js-env

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/javascript-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
eslint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6

- uses: ./.github/actions/setup-js-env

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/label-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ jobs:
needs: job_picker
if: needs.job_picker.outputs.run == 'pr_review'
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
with:
# Force checkout the main repo (base branch) so that repo secrets
# are not available to unexpected/malicious PR code.
Expand Down Expand Up @@ -104,7 +104,7 @@ jobs:
needs: job_picker
if: needs.job_picker.outputs.run == 'push_commit'
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
with:
# Force checkout the main repo (base branch) so that repo secrets
# are not available to unexpected/malicious PR code.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/markdown-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
markdownlint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6

- uses: ./.github/actions/setup-js-env

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/post-process.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
contents: read
pull-requests: read
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6

- uses: ./.github/actions/setup-js-env

Expand Down
26 changes: 15 additions & 11 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ jobs:
do_release: ${{ steps.check_tag.outputs.do_release }}
steps:
- name: Checkout Code
uses: actions/checkout@v4
uses: actions/checkout@v6
with:
fetch-depth: 0

- name: Get Project Version
id: get_version
uses: 'euberdeveloper/ga-project-version@main'
run: echo "version=$(npm pkg get version | tr -d '\"')" >> $GITHUB_OUTPUT

- name: Check Tag Exists
id: check_tag
Expand All @@ -45,7 +45,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Code
uses: actions/checkout@v4
uses: actions/checkout@v6
with:
fetch-depth: 0

Expand All @@ -65,18 +65,18 @@ jobs:
GITHUB_TOKEN: ${{ secrets.BOT_TOKEN }}
steps:
- name: Checkout Code
uses: actions/checkout@v4
uses: actions/checkout@v6
with:
fetch-depth: 0

- name: Set up msbuild
uses: microsoft/setup-msbuild@v1.0.2
uses: microsoft/setup-msbuild@v3

- uses: ./.github/actions/setup-js-env

- name: Check dependencies cache
id: cache-dependencies
uses: actions/cache@v4
uses: actions/cache@v5
with:
path: ./plugin/ThirdParty
key: |
Expand Down Expand Up @@ -118,9 +118,10 @@ jobs:

- name: Fetch Release Attributes
id: fetch_attributes
uses: zoexx/github-action-json-file-properties@release
with:
file_path: "package.json"
shell: bash
run: |
echo "releaseSummary=$(npm pkg get releaseSummary | tr -d '\"')" >> $GITHUB_OUTPUT
echo "releaseInDraft=$(npm pkg get releaseInDraft | tr -d '\"')" >> $GITHUB_OUTPUT

- name: Set Release Attributes
id: set_attributes
Expand All @@ -142,7 +143,10 @@ jobs:
echo "release_draft=$release_draft" >> $env:GITHUB_OUTPUT

- name: Create Release
uses: ncipollo/release-action@v1
# Note: This action has a literal `@v1` tag and release which are no longer being updated.
# As such, we have to specify an exact version to avoid getting the outdated build.
# Should it ever release a v2 release with proper semantic version, update to use that.
uses: ncipollo/release-action@v1.21.0
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As with other places, I think it would be fine to pin only the major versions.

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm fine with using major versions for most actions, but this specific one has a literal v1 tag/release which is no longer being updated.

https://github.com/ncipollo/release-action/releases

image

Maybe it makes sense to comment above this and note that if it ever releases a v2, we can go back to using major version?

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have added a comment here and the other case where this is a potential issue. I think the comments make sense.

with:
name: ${{ steps.set_attributes.outputs.release_name }}
tag: v${{ needs.validate_tag.outputs.version }}
Expand All @@ -160,7 +164,7 @@ jobs:
if: ${{ github.repository == 'OverlayPlugin/cactbot' }}
steps:
- name: Checkout Code
uses: actions/checkout@v4
uses: actions/checkout@v6

- uses: ./.github/actions/setup-js-env

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-sync-files.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
main:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6

- uses: ./.github/actions/setup-js-env

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-validate-versions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
main:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6

- uses: ./.github/actions/setup-js-env

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6

- uses: ./.github/actions/setup-js-env

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-gh-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
pull-requests: read
steps:
- name: Checkout Code
uses: actions/checkout@v4
uses: actions/checkout@v6
with:
fetch-depth: 0

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-triggers-branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
needs: check-triggers
if: needs.check-triggers.outputs.found == 'true'
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6

- uses: ./.github/actions/setup-js-env

Expand Down
9 changes: 6 additions & 3 deletions .github/workflows/update_logdefs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
runs-on: ubuntu-latest
if: ${{ github.repository == 'OverlayPlugin/cactbot' }}
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
with:
ref: main

Expand All @@ -29,14 +29,17 @@ jobs:

- name: Render PR Template
id: template
uses: chuhlomin/render-template@v1.9
# Note: This action has a literal `@v1` tag and release which is actively being updated.
# If that status changes, we will have to specify an exact version to avoid getting the
# outdated build.
uses: chuhlomin/render-template@v1
with:
template: .github/logdef_update_pr_template.md
vars: |
changelist: "${{ steps.script.outputs.changelist }}"

- name: Create PR
uses: peter-evans/create-pull-request@v6
uses: peter-evans/create-pull-request@v8
with:
commit-message: 'update netlog_defs filters'
title: 'resources: Update netlog_defs filters (auto-generated)'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/workflow-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
main:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6

- name: Install yamllint
run: |
Expand Down
Loading