Skip to content
Merged
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/workflows/cla.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:

jobs:
CLA:
runs-on: ubuntu-latest
runs-on: blacksmith-2vcpu-ubuntu-2404
# This job should only run for pull request comments or pull request target events (not issue comments)
if: github.event.issue.pull_request || github.event_name == 'pull_request_target'
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/npmPublish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ on:

jobs:
publish:
runs-on: ubuntu-latest
runs-on: blacksmith-2vcpu-ubuntu-2404
permissions:
contents: read
id-token: write # Required for OIDC: https://docs.npmjs.com/trusted-publishers
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/shellCheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
jobs:
lint:
if: ${{ github.actor != 'OSBotify' || github.event_name == 'workflow_call' }}
runs-on: ubuntu-latest
runs-on: blacksmith-2vcpu-ubuntu-2404
steps:
- name: Checkout
# 4.2.2
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/validateActions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on: pull_request

jobs:
validateSchemas:
runs-on: ubuntu-latest
runs-on: blacksmith-2vcpu-ubuntu-2404
if: ${{ !contains(github.actor, '[bot]') && github.actor != 'MelvinBot' && github.actor != 'botify' && github.actor != 'OSBotify' }}
steps:
- name: Checkout repos
Expand All @@ -34,7 +34,7 @@ jobs:
run: echo "::error::The validateWorkflowSchemas check failed! To run it locally, go to the root of ${{ steps.repo.outputs.NAME }} and run <path_to_github_actions_repo>/scripts/validateWorkflowSchemas.sh"

actionlint:
runs-on: ubuntu-latest
runs-on: blacksmith-2vcpu-ubuntu-2404
if: ${{ !contains(github.actor, '[bot]') && github.actor != 'MelvinBot' && github.actor != 'botify' && github.actor != 'OSBotify' }}
steps:
- name: Checkout repos
Expand All @@ -51,7 +51,7 @@ jobs:
run: echo "::error::The actionlint check failed! To run it locally, go to the root of ${{ steps.repo.outputs.NAME }} and run <path_to_github_actions_repo>/scripts/actionlint.sh"

validateImmutableActionRefs:
runs-on: ubuntu-latest
runs-on: blacksmith-2vcpu-ubuntu-2404
if: ${{ !contains(github.actor, '[bot]') && github.actor != 'MelvinBot' && github.actor != 'botify' && github.actor != 'OSBotify' }}
steps:
- name: Checkout repos
Expand Down
13 changes: 12 additions & 1 deletion scripts/actionlint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,18 @@ fi
info "Linting workflows..."
echo
cd "$REPO_ROOT" || exit 1
if ! "$ACTIONLINT_PATH" -color; then

# If a repo has it's own action lint config, use that. Otherwise, use the one in this repo.
CONFIG=""
if [[ ! -f "$REPO_ROOT/.github/actionlint.yml" ]] && [[ ! -f "$REPO_ROOT/.github/actionlint.yaml" ]]; then
CONFIG=" -config-file $(readlink -f "$SCRIPT_DIR"/../.github/actionlint.yml)"
info "Using default Github-Actions repo actionlint.yml" >&2
fi

# We can't quote CONFIG here because we need the splitting on spaces for it to be recognized
# by actionlint as a flag
#shellcheck disable=SC2086
if ! "$ACTIONLINT_PATH" ${CONFIG} -color; then
error "Workflows did not pass actionlint :("
exit 1
fi
Expand Down