Skip to content

chore: harden GitHub Actions workflows #2170

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jonathan343 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

chore: harden GitHub Actions workflows #2170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 10 additions & 4 deletions .github/actions/checkout-smithy-swift-composite-action/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,26 +14,31 @@ runs:
if: ${{ github.repository != 'awslabs/aws-sdk-swift' }}
run: |
mkdir -p ~/.ssh
echo "${{ inputs.STAGING_PARTNER_REPO_PRIVATE_DEPLOY_KEY }}" > ~/.ssh/id_rsa
echo "${INPUTS_STAGING_PARTNER_REPO_PRIVATE_DEPLOY_KEY}" > ~/.ssh/id_rsa
chmod 600 ~/.ssh/id_rsa
ssh-keyscan github.com >> ~/.ssh/known_hosts
shell: bash
env:
INPUTS_STAGING_PARTNER_REPO_PRIVATE_DEPLOY_KEY: ${{ inputs.STAGING_PARTNER_REPO_PRIVATE_DEPLOY_KEY }}
- name: Select staging smithy-swift branch
if: ${{ github.repository != 'awslabs/aws-sdk-swift' }}
run: |
cd aws-sdk-swift
ORIGINAL_REPO_HEAD_REF="$GITHUB_HEAD_REF" \
DEPENDENCY_REPO_URL="git@github.com:${{ inputs.STAGING_PARTNER_REPO }}.git" \
DEPENDENCY_REPO_URL="git@github.com:${INPUTS_STAGING_PARTNER_REPO}.git" \
./scripts/ci_steps/select_dependency_branch.sh
shell: bash
env:
INPUTS_STAGING_PARTNER_REPO: ${{ inputs.STAGING_PARTNER_REPO }}
- name: Checkout staging smithy-swift
if: ${{ github.repository != 'awslabs/aws-sdk-swift' }}
uses: actions/checkout@v6
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
with:
repository: ${{ inputs.STAGING_PARTNER_REPO }}
ref: ${{ env.DEPENDENCY_REPO_SHA }}
path: smithy-swift
ssh-key: ${{ inputs.STAGING_PARTNER_REPO_PRIVATE_DEPLOY_KEY }}
persist-credentials: false
- name: Select smithy-swift branch
if: ${{ github.repository == 'awslabs/aws-sdk-swift' }}
run: |
Expand All @@ -44,8 +49,9 @@ runs:
shell: bash
- name: Checkout smithy-swift
if: ${{ github.repository == 'awslabs/aws-sdk-swift' }}
uses: actions/checkout@v6
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
with:
repository: smithy-lang/smithy-swift
ref: ${{ env.DEPENDENCY_REPO_SHA }}
path: smithy-swift
persist-credentials: false
2 changes: 2 additions & 0 deletions .github/dependabot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,5 @@ updates:
directory: "/" # Location of package manifests
schedule:
interval: "daily"
cooldown:
default-days: 7
9 changes: 5 additions & 4 deletions .github/workflows/codegen-build-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,17 @@ jobs:
DEVELOPER_DIR: /Applications/Xcode_26.4.app/Contents/Developer
steps:
- name: Checkout aws-sdk-swift
uses: actions/checkout@v6
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
with:
path: aws-sdk-swift
persist-credentials: false
- name: Checkout smithy-swift with composite action
uses: ./aws-sdk-swift/.github/actions/checkout-smithy-swift-composite-action
with:
STAGING_PARTNER_REPO_PRIVATE_DEPLOY_KEY: ${{ secrets.STAGING_PARTNER_REPO_PRIVATE_DEPLOY_KEY }}
STAGING_PARTNER_REPO: ${{ secrets.STAGING_PARTNER_REPO }}
- name: Cache Gradle
uses: actions/cache@v5
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
with:
path: |
~/.gradle/caches
Expand All @@ -43,7 +44,7 @@ jobs:
2-${{ runner.os }}-gradle-${{ hashFiles('*.gradle.kts', 'gradle/wrapper/gradle-wrapper.properties') }}
2-${{ runner.os }}-gradle-
- name: Cache Swift
uses: actions/cache@v5
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
with:
path: |
~/Library/Caches/org.swift.swiftpm
Expand All @@ -53,7 +54,7 @@ jobs:
1-${{ runner.os }}-${{ matrix.xcode }}-${{ hashFiles('Package.swift', 'AWSSDKSwiftCLI/Package.swift') }}
1-${{ runner.os }}-${{ matrix.xcode }}-
- name: Setup Java
uses: actions/setup-java@v5
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
with:
distribution: corretto
java-version: 17
Expand Down
18 changes: 10 additions & 8 deletions .github/workflows/continuous-integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,16 +59,17 @@ jobs:
- name: Configure Xcode
run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app
- name: Checkout aws-sdk-swift
uses: actions/checkout@v6
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
with:
path: aws-sdk-swift
persist-credentials: false
- name: Checkout smithy-swift with composite action
uses: ./aws-sdk-swift/.github/actions/checkout-smithy-swift-composite-action
with:
STAGING_PARTNER_REPO_PRIVATE_DEPLOY_KEY: ${{ secrets.STAGING_PARTNER_REPO_PRIVATE_DEPLOY_KEY }}
STAGING_PARTNER_REPO: ${{ secrets.STAGING_PARTNER_REPO }}
- name: Cache Gradle
uses: actions/cache@v5
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
with:
path: |
~/.gradle/caches
Expand All @@ -78,7 +79,7 @@ jobs:
2-${{ runner.os }}-gradle-${{ hashFiles('*.gradle.kts', 'gradle/wrapper/gradle-wrapper.properties') }}
2-${{ runner.os }}-gradle-
- name: Cache Swift
uses: actions/cache@v5
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
with:
path: |
~/Library/Caches/org.swift.swiftpm
Expand All @@ -88,7 +89,7 @@ jobs:
1-${{ runner.os }}-${{ matrix.xcode }}-${{ hashFiles('Package.swift', 'AWSSDKSwiftCLI/Package.swift') }}
1-${{ runner.os }}-${{ matrix.xcode }}-
- name: Setup Java
uses: actions/setup-java@v4
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
with:
distribution: corretto
java-version: 17
Expand Down Expand Up @@ -142,16 +143,17 @@ jobs:
- 6.3-amazonlinux2023
steps:
- name: Checkout aws-sdk-swift
uses: actions/checkout@v6
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
with:
path: aws-sdk-swift
persist-credentials: false
- name: Checkout smithy-swift with composite action
uses: ./aws-sdk-swift/.github/actions/checkout-smithy-swift-composite-action
with:
STAGING_PARTNER_REPO_PRIVATE_DEPLOY_KEY: ${{ secrets.STAGING_PARTNER_REPO_PRIVATE_DEPLOY_KEY }}
STAGING_PARTNER_REPO: ${{ secrets.STAGING_PARTNER_REPO }}
- name: Cache Gradle
uses: actions/cache@v5
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
with:
path: |
~/.gradle/caches
Expand All @@ -161,7 +163,7 @@ jobs:
2-${{ runner.os }}-gradle-${{ hashFiles('*.gradle.kts', 'gradle/wrapper/gradle-wrapper.properties') }}
2-${{ runner.os }}-gradle-
- name: Cache Swift
uses: actions/cache@v5
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
with:
path: |
~/Library/Caches/org.swift.swiftpm
Expand All @@ -171,7 +173,7 @@ jobs:
1-${{ runner.os }}-swift-${{ matrix.swift }}-spm-${{ hashFiles('Package.swift', 'AWSSDKSwiftCLI/Package.swift') }}
1-${{ runner.os }}-swift-${{ matrix.swift }}-spm-
- name: Setup Java
uses: actions/setup-java@v4
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
with:
distribution: corretto
java-version: 17
Expand Down
29 changes: 18 additions & 11 deletions .github/workflows/integration-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,16 @@ env:
AWS_SWIFT_SDK_USE_LOCAL_DEPS: 1

permissions:
id-token: write
contents: read
actions: read

jobs:
apple-int:
if: github.repository == 'awslabs/aws-sdk-swift' || github.event_name == 'pull_request'
runs-on: ${{ matrix.runner }}
permissions:
id-token: write
contents: read
strategy:
fail-fast: false
matrix:
Expand Down Expand Up @@ -61,21 +63,22 @@ jobs:
- name: Configure Xcode
run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app
- name: Configure AWS Credentials for Integration Tests
uses: aws-actions/configure-aws-credentials@v6
uses: aws-actions/configure-aws-credentials@d979d5b3a71173a29b74b5b88418bfda9437d885 # v6.1.1
with:
role-to-assume: ${{ secrets.INTEGRATION_TEST_ROLE_ARN }}
aws-region: us-west-2
- name: Checkout aws-sdk-swift
uses: actions/checkout@v6
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
with:
path: aws-sdk-swift
persist-credentials: false
- name: Checkout smithy-swift with composite action
uses: ./aws-sdk-swift/.github/actions/checkout-smithy-swift-composite-action
with:
STAGING_PARTNER_REPO_PRIVATE_DEPLOY_KEY: ${{ secrets.STAGING_PARTNER_REPO_PRIVATE_DEPLOY_KEY }}
STAGING_PARTNER_REPO: ${{ secrets.STAGING_PARTNER_REPO }}
- name: Cache Gradle
uses: actions/cache@v5
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
with:
path: |
~/.gradle/caches
Expand All @@ -85,7 +88,7 @@ jobs:
2-${{ runner.os }}-gradle-${{ hashFiles('*.gradle.kts', 'gradle/wrapper/gradle-wrapper.properties') }}
2-${{ runner.os }}-gradle-
- name: Cache Swift
uses: actions/cache@v5
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
with:
path: |
~/Library/Caches/org.swift.swiftpm
Expand All @@ -95,7 +98,7 @@ jobs:
1-${{ runner.os }}-${{ matrix.xcode }}-${{ hashFiles('Package.swift', 'AWSSDKSwiftCLI/Package.swift') }}
1-${{ runner.os }}-${{ matrix.xcode }}-
- name: Setup Java
uses: actions/setup-java@v5
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
with:
distribution: corretto
java-version: 17
Expand Down Expand Up @@ -134,6 +137,9 @@ jobs:
if: github.repository == 'awslabs/aws-sdk-swift' || github.event_name == 'pull_request'
runs-on: ${{ matrix.runner }}
container: swift:${{ matrix.swift }}
permissions:
id-token: write
contents: read
strategy:
fail-fast: false
matrix:
Expand All @@ -147,21 +153,22 @@ jobs:
- 6.3-amazonlinux2023
steps:
- name: Configure AWS Credentials for Integration Tests
uses: aws-actions/configure-aws-credentials@v6
uses: aws-actions/configure-aws-credentials@d979d5b3a71173a29b74b5b88418bfda9437d885 # v6.1.1
with:
role-to-assume: ${{ secrets.INTEGRATION_TEST_ROLE_ARN }}
aws-region: us-west-2
- name: Checkout aws-sdk-swift
uses: actions/checkout@v6
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
with:
path: aws-sdk-swift
persist-credentials: false
- name: Checkout smithy-swift with composite action
uses: ./aws-sdk-swift/.github/actions/checkout-smithy-swift-composite-action
with:
STAGING_PARTNER_REPO_PRIVATE_DEPLOY_KEY: ${{ secrets.STAGING_PARTNER_REPO_PRIVATE_DEPLOY_KEY }}
STAGING_PARTNER_REPO: ${{ secrets.STAGING_PARTNER_REPO }}
- name: Cache Gradle
uses: actions/cache@v5
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
with:
path: |
~/.gradle/caches
Expand All @@ -171,7 +178,7 @@ jobs:
2-${{ runner.os }}-gradle-${{ hashFiles('*.gradle.kts', 'gradle/wrapper/gradle-wrapper.properties') }}
2-${{ runner.os }}-gradle-
- name: Cache Swift
uses: actions/cache@v5
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
with:
path: |
~/Library/Caches/org.swift.swiftpm
Expand All @@ -181,7 +188,7 @@ jobs:
1-${{ runner.os }}-swift-${{ matrix.swift }}-spm-${{ hashFiles('Package.swift', 'AWSSDKSwiftCLI/Package.swift') }}
1-${{ runner.os }}-swift-${{ matrix.swift }}-spm-
- name: Setup Java
uses: actions/setup-java@v5
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
with:
distribution: corretto
java-version: 17
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/lint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout sources
uses: actions/checkout@v6
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
with:
persist-credentials: false
- name: Lint smithy-aws-swift-codegen
run: ./gradlew ktlint

Expand All @@ -27,9 +29,10 @@ jobs:
runs-on: macos-26
steps:
- name: Checkout sources
uses: actions/checkout@v6
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
with:
path: aws-sdk-swift
persist-credentials: false
- name: Checkout smithy-swift with composite action
uses: ./aws-sdk-swift/.github/actions/checkout-smithy-swift-composite-action
with:
Expand Down
9 changes: 6 additions & 3 deletions .github/workflows/release-configuration-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,22 +24,25 @@ jobs:
DEVELOPER_DIR: /Applications/Xcode_26.4.app/Contents/Developer
steps:
- name: Checkout aws-sdk-swift
uses: actions/checkout@v6
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
with:
persist-credentials: false
- name: Select smithy-swift branch
run: |
ORIGINAL_REPO_HEAD_REF="${GITHUB_HEAD_REF:-$GITHUB_REF_NAME}" \
DEPENDENCY_REPO_URL="https://github.com/smithy-lang/smithy-swift.git" \
./scripts/ci_steps/select_dependency_branch.sh
- name: Checkout smithy-swift
uses: actions/checkout@v6
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
with:
repository: smithy-lang/smithy-swift
ref: ${{ env.DEPENDENCY_REPO_SHA }}
path: smithy-swift
persist-credentials: false
- name: Move smithy-swift into place
run: mv smithy-swift ..
- name: Setup Java
uses: actions/setup-java@v5
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
with:
distribution: corretto
java-version: 17
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/repo-sync.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:

steps:
- name: git-sync
uses: wei/git-sync@v3
uses: wei/git-sync@55c6b63b4f21607da0e9877ca9b4d11a29fc6d83 # v3.0.0
with:
source_repo: ${{ secrets.GIT_SYNC_SOURCE_REPO }}
source_branch: "main"
Expand Down
9 changes: 5 additions & 4 deletions .github/workflows/swift6-compatibility.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,17 @@ jobs:
DEVELOPER_DIR: /Applications/Xcode_26.4.app/Contents/Developer
steps:
- name: Checkout aws-sdk-swift
uses: actions/checkout@v6
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
with:
path: aws-sdk-swift
persist-credentials: false
- name: Checkout smithy-swift with composite action
uses: ./aws-sdk-swift/.github/actions/checkout-smithy-swift-composite-action
with:
STAGING_PARTNER_REPO_PRIVATE_DEPLOY_KEY: ${{ secrets.STAGING_PARTNER_REPO_PRIVATE_DEPLOY_KEY }}
STAGING_PARTNER_REPO: ${{ secrets.STAGING_PARTNER_REPO }}
- name: Cache Gradle
uses: actions/cache@v5
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
with:
path: |
~/.gradle/caches
Expand All @@ -39,7 +40,7 @@ jobs:
2-${{ runner.os }}-gradle-${{ hashFiles('*.gradle.kts', 'gradle/wrapper/gradle-wrapper.properties') }}
2-${{ runner.os }}-gradle-
- name: Cache Swift
uses: actions/cache@v5
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
with:
path: |
~/Library/Caches/org.swift.swiftpm
Expand All @@ -49,7 +50,7 @@ jobs:
1-${{ runner.os }}-${{ matrix.xcode }}-${{ hashFiles('Package.swift', 'AWSSDKSwiftCLI/Package.swift') }}
1-${{ runner.os }}-${{ matrix.xcode }}-
- name: Setup Java
uses: actions/setup-java@v5
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
with:
distribution: corretto
java-version: 17
Expand Down
Loading