Skip to content

Commit 5065461

Browse files
authored
Fix version handling and make some secrets optional (#19)
1 parent 6a1c75d commit 5065461

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

.github/workflows/update-action-tag.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@ jobs:
3535
run: |
3636
export VERSION=$(cat .github/workflows/version.txt)
3737
echo "VERSION=$VERSION" >> $GITHUB_ENV
38-
git push origin ":${VERSION}"
38+
git push origin ":v${VERSION}"
3939
4040
- name: Create a new signed tag
4141
uses: mongodb-labs/drivers-github-tools/git-sign@v2
4242
with:
43-
command: git tag -m "Update tag" -s --local-user=${{ env.GPG_KEY_ID }} ${{ env.VERSION }}"
43+
command: git tag -m "Update tag" -s --local-user=${{ env.GPG_KEY_ID }} v${{ env.VERSION }}"
4444

4545
- name: Push the tag
4646
run:

README.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,11 @@ The action requires `id-token: write` permissions.
2626
> You *must* use the `actions/checkout` action prior to calling the `setup` action,
2727
> Since the `setup` action sets up git config that would be overridden by the
2828
> `actions/checkout action`
29+
>
30+
> The following keys MUST be defined in the ``AWS_SECRET_ID`` vault:
31+
> `artifactory-username`, `artifactory-password`, `garasign-username`
32+
> `garasign-password`, `gpg-key-id`. If uploading to an S3 bucket, also define
33+
> `release-assets-bucket`.
2934

3035
## Signing tools
3136

setup/setup.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ mkdir $S3_ASSETS
3030

3131
echo "Set up global variables"
3232
cat <<EOF >> $GITHUB_ENV
33-
AWS_BUCKET=$RELEASE_ASSETS_BUCKET
33+
AWS_BUCKET=${RELEASE_ASSETS_BUCKET:-}"
3434
GPG_KEY_ID=$GPG_KEY_ID
35-
GPG_PUBLIC_URL=$GPG_PUBLIC_URL
35+
GPG_PUBLIC_URL=${GPG_PUBLIC_URL:-}"
3636
GARASIGN_ENVFILE=$GARASIGN_ENVFILE
3737
ARTIFACTORY_REGISTRY=$ARTIFACTORY_REGISTRY
3838
RELEASE_ASSETS=$RELEASE_ASSETS

0 commit comments

Comments
 (0)