-
Notifications
You must be signed in to change notification settings - Fork 551
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge develop into stable for v2024.04.03 release
- Loading branch information
Showing
10 changed files
with
315 additions
and
266 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -444,95 +444,3 @@ jobs: | |
| atomic: true | ||
| branch: develop | ||
| repository: ${{ github.repository }} | ||
|
|
||
|
|
||
| salt: | ||
| name: Update Release on Salt Repo | ||
| runs-on: | ||
| - self-hosted | ||
| - linux | ||
| - repo-release | ||
| needs: | ||
| - update-develop-checksums | ||
| environment: release | ||
| permissions: | ||
| contents: write # For action peter-evans/create-pull-request | ||
| pull-requests: write # For action peter-evans/create-pull-request | ||
|
|
||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| with: | ||
| ref: stable | ||
| repository: ${{ github.repository }} | ||
|
|
||
| - name: Get bootstrap version | ||
| run: | | ||
| echo "BS_VERSION=$(sh bootstrap-salt.sh -v | awk '{ print $4 }')" >> "$GITHUB_ENV" | ||
| - uses: actions/checkout@v3 | ||
| with: | ||
| repository: saltstack/salt | ||
| ref: master | ||
| path: salt-checkout | ||
| token: ${{ secrets.SALT_REPO_WRITE_TOKEN }} | ||
|
|
||
| - name: Setup GnuPG | ||
| run: | | ||
| sudo install -d -m 0700 -o "$(id -u)" -g "$(id -g)" /run/gpg | ||
| GNUPGHOME="$(mktemp -d -p /run/gpg)" | ||
| echo "GNUPGHOME=${GNUPGHOME}" >> "$GITHUB_ENV" | ||
| cat <<EOF > "${GNUPGHOME}/gpg.conf" | ||
| batch | ||
| no-tty | ||
| pinentry-mode loopback | ||
| EOF | ||
| - name: Get Secrets | ||
| id: get-secrets | ||
| env: | ||
| SECRETS_KEY: ${{ secrets.SECRETS_KEY }} | ||
| run: | | ||
| SECRETS_KEY_FILE=$(mktemp /tmp/output.XXXXXXXXXX) | ||
| echo "$SECRETS_KEY" > "$SECRETS_KEY_FILE" | ||
| aws --region us-west-2 secretsmanager get-secret-value --secret-id /cmbu-saltstack/signing/repo-signing-keys-sha256-2023 \ | ||
| --query SecretString --output text | jq .default_key -r | base64 -d \ | ||
| | gpg --passphrase-file "${SECRETS_KEY_FILE}" -d - \ | ||
| | gpg --import - | ||
| sync | ||
| aws --region us-west-2 secretsmanager get-secret-value --secret-id /cmbu-saltstack/signing/repo-signing-keys-sha256-2023 \ | ||
| --query SecretString --output text| jq .default_passphrase -r | base64 -d \ | ||
| | gpg --passphrase-file "${SECRETS_KEY_FILE}" -o "${GNUPGHOME}/passphrase" -d - | ||
| sync | ||
| rm "$SECRETS_KEY_FILE" | ||
| echo "passphrase-file ${GNUPGHOME}/passphrase" >> "${GNUPGHOME}/gpg.conf" | ||
| - name: Configure Git | ||
| shell: bash | ||
| run: | | ||
| git config --global --add safe.directory "$(pwd)" | ||
| git config --global user.name "Salt Project Packaging" | ||
| git config --global user.email [email protected] | ||
| git config --global user.signingkey 64CBBC8173D76B3F | ||
| git config --global commit.gpgsign true | ||
| - name: Update bootstrap script on Salt | ||
| run: | | ||
| cp bootstrap-salt.sh salt-checkout/salt/cloud/deploy/bootstrap-salt.sh | ||
| - name: Commit Changes | ||
| working-directory: salt-checkout/ | ||
| run: | | ||
| git commit -am "Update the bootstrap script to v${{ env.BS_VERSION }}" | ||
| - name: Create Pull Request Against Develop | ||
| uses: peter-evans/create-pull-request@v5 | ||
| with: | ||
| title: "Update the bootstrap script to v${{ env.BS_VERSION }}" | ||
| path: salt-checkout | ||
| base: master | ||
| token: ${{ secrets.SALT_REPO_WRITE_TOKEN }} | ||
| author: "Salt Project Packaging <[email protected]>" | ||
| committer: "Salt Project Packaging <[email protected]>" | ||
| commit-message: Update the bootstrap script to v${{ env.BS_VERSION }} | ||
| signoff: true | ||
| delete-branch: true | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.