Skip to content

Commit 7f5a886

Browse files
committed
Merge remote-tracking branch 'origin/main' into allow-second-token-integration-tests
2 parents 017b5a3 + a8fef26 commit 7f5a886

30 files changed

+2309
-85
lines changed
Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
name: Check and Update dist in js actions
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
paths:
8+
- 'execute-workflow/**'
9+
10+
permissions:
11+
contents: write
12+
13+
jobs:
14+
check-and-update-dist:
15+
runs-on: ubuntu-latest
16+
17+
steps:
18+
- name: Checkout
19+
uses: actions/checkout@v5
20+
with:
21+
token: ${{ secrets.APIFY_SERVICE_ACCOUNT_GITHUB_TOKEN }}
22+
23+
- name: Setup Node.js
24+
uses: actions/setup-node@v6
25+
with:
26+
node-version: '24'
27+
cache: 'npm'
28+
cache-dependency-path: execute-workflow/package-lock.json
29+
30+
- name: Install dependencies
31+
working-directory: execute-workflow
32+
run: npm ci
33+
34+
- name: Rebuild dist
35+
working-directory: execute-workflow
36+
run: npm run build
37+
38+
- name: Commit and push if changed
39+
uses: EndBug/add-and-commit@v9
40+
with:
41+
author_name: Apify Release Bot
42+
author_email: noreply@apify.com
43+
message: "chore: rebuild execute-workflow dist [skip ci]"
44+
add: 'execute-workflow/dist/'

.github/workflows/create_changelog.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ on:
5858

5959
jobs:
6060
release:
61-
runs-on: ubuntu-latest
61+
runs-on: ubuntu-22.04-arm64
6262
steps:
6363
- name: get changelog
6464
id: changelog

.github/workflows/deploy_cloudformation.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,9 @@ on:
8888
slackToken:
8989
description: Slack API token
9090
required: false
91+
secretParameters:
92+
description: Secret parameters (plaint text or file) for cloudformation template. Limited security, scoped per CF stack.
93+
required: false
9194

9295
jobs:
9396
deploy:
@@ -192,7 +195,9 @@ jobs:
192195
fi
193196
194197
OPTIONAL_PARAMETERS=""
195-
if [ "${{ inputs.parameters }}" != "" ]; then
198+
if [ "${{ inputs.parameters }}" != "" ] && [ "${{ secrets.secretParameters }}" != "" ]; then
199+
OPTIONAL_PARAMETERS="${OPTIONAL_PARAMETERS} --parameter-overrides ${{ inputs.parameters }} ${{ secrets.secretParameters }}"
200+
elif [ "${{ inputs.parameters }}" != "" ] && [ "${{ secrets.secretParameters }}" == "" ]; then
196201
OPTIONAL_PARAMETERS="${OPTIONAL_PARAMETERS} --parameter-overrides ${{ inputs.parameters }}"
197202
fi
198203
if [ "${{ inputs.capabilities }}" != "" ]; then

.github/workflows/invalidate_cloudfront.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ on:
5252

5353
jobs:
5454
invalidate:
55-
runs-on: ubuntu-latest
55+
runs-on: ubuntu-22.04-arm64
5656
steps:
5757
- name: assume IAM role
5858
uses: aws-actions/configure-aws-credentials@v4
@@ -62,11 +62,11 @@ jobs:
6262
aws-region: ${{ inputs.awsRegion }}
6363
role-to-assume: ${{ inputs.awsRoleArn }}
6464
role-duration-seconds: ${{ inputs.awsSessionDuration }}
65-
65+
6666
# This parameter is needed otherwise this action is trying to tag session
6767
# which does not work for cross-account assume
6868
role-skip-session-tagging: true
69-
69+
7070
- name: invalidate
7171
run: |
7272
echo ">>> Invalidating path ${{ inputs.path }} of distribution ${{ inputs.distributionId }}"

.github/workflows/lint_cloudformation.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ env:
2121

2222
jobs:
2323
lint:
24-
runs-on: ubuntu-latest
24+
runs-on: ubuntu-22.04-arm64
2525
steps:
2626
- name: clone repository
2727
uses: actions/checkout@v4

.github/workflows/lint_gh_actions.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ env:
1414

1515
jobs:
1616
lint:
17-
runs-on: ubuntu-latest
17+
runs-on: ubuntu-22.04-arm64
1818
steps:
1919
- name: clone repository
2020
uses: actions/checkout@v4

.github/workflows/lint_helmfile.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ on:
2626

2727
env:
2828
# renovate: datasource=github-releases depName=helmfile/helmfile
29-
HELMFILE_VERSION: v0.164.0
29+
HELMFILE_VERSION: v0.171.0
3030

3131
jobs:
3232
lint:
33-
runs-on: ubuntu-latest
33+
runs-on: ubuntu-22.04-arm64
3434
steps:
3535
- name: clone repository
3636
uses: actions/checkout@v4
@@ -39,7 +39,7 @@ jobs:
3939
run: |
4040
HELMFILE_VERSION_WITHOUT_PREFIX=${HELMFILE_VERSION:1}
4141
mkdir -p $HOME/.local/bin
42-
curl -fsSL -o helmfile.tar.gz https://github.com/helmfile/helmfile/releases/download/${{ env.HELMFILE_VERSION }}/helmfile_${HELMFILE_VERSION_WITHOUT_PREFIX}_linux_amd64.tar.gz
42+
curl -fsSL -o helmfile.tar.gz https://github.com/helmfile/helmfile/releases/download/${{ env.HELMFILE_VERSION }}/helmfile_${HELMFILE_VERSION_WITHOUT_PREFIX}_linux_arm64.tar.gz
4343
tar -C $HOME/.local/bin/ -xf ./helmfile.tar.gz
4444
chmod +x $HOME/.local/bin/helmfile
4545
echo "$HOME/.local/bin" >> $GITHUB_PATH

.github/workflows/local_lint_gh_actions.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,6 @@ jobs:
1313
lint:
1414
uses: ./.github/workflows/lint_gh_actions.yaml
1515
with:
16-
extraArgs: -ignore 'property "aws_.+" is not defined in .+'
16+
extraArgs: >
17+
-ignore 'label "ubuntu-22.04-arm64" is unknown. .+'
18+
-ignore 'property "aws_.+" is not defined in .+'

.github/workflows/open_pull_request.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ on:
2626
jobs:
2727
# TODO: these steps could be separate wf
2828
open-pull-request:
29-
runs-on: ubuntu-latest
29+
runs-on: ubuntu-22.04-arm64
3030
steps:
3131
- name: open release pull-request
3232
uses: apify/release-pr-action@v3.2.0

.github/workflows/pull_request_toolkit.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ concurrency: # This is to make sure that it's executed only for the most recent
1111

1212
jobs:
1313
apify-pr-toolkit:
14-
# Commented out as it sometimes happens that once PR was in a draft the workflows are not being run later on.
14+
# Commented out as it sometimes happens that once PR was in a draft the workflows are not being run later on.
1515
# if: github.event.pull_request.draft == false
16-
runs-on: ubuntu-latest
16+
runs-on: ubuntu-22.04-arm64
1717
steps:
1818
- name: run pull-request-toolkit action
1919
uses: apify/pull-request-toolkit-action@main

0 commit comments

Comments
 (0)