Skip to content

Commit

Permalink
ignore prerelease verions when uploading version file on release
Browse files Browse the repository at this point in the history
  • Loading branch information
wagoodman committed Jul 29, 2020
1 parent bc69382 commit ad1a72c
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 14 deletions.
26 changes: 26 additions & 0 deletions .github/scripts/update-version-file.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
#!/usr/bin/env bash
set -ue

BIN="syft"
DISTDIR=$1
VERSION=$2

if [[ $VERSION == *-* ]] ; then
echo "skipping publishing a version file (this is a pre-release: ${VERSION})"
exit 0
fi

echo "creating and publishing version file"

# create a version file for version-update checks
echo "${VERSION}" | tee ${DISTDIR}/VERSION

# upload the version file that supports the application version update check
docker run --rm \
-i \
-e AWS_DEFAULT_REGION=us-west-2 \
-e AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID} \
-e AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY} \
-v $(pwd)/${DISTDIR}/:/distmount \
amazon/aws-cli \
s3 cp /distmount/VERSION s3://toolbox-data.anchore.io/${BIN}/releases/latest/VERSION
4 changes: 2 additions & 2 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,8 @@ jobs:
GPG_PRIVATE_KEY: ${{ secrets.SIGNING_GPG_PRIVATE_KEY }}
PASSPHRASE: ${{ secrets.SIGNING_GPG_PASSPHRASE }}
SIGNING_FINGERPRINT: ${{ steps.import_gpg.outputs.fingerprint }}
TOOLBOX_AWS_ACCESS_KEY_ID: ${{ secrets.TOOLBOX_AWS_ACCESS_KEY_ID }}
TOOLBOX_AWS_SECRET_ACCESS_KEY: ${{ secrets.TOOLBOX_AWS_SECRET_ACCESS_KEY }}
AWS_ACCESS_KEY_ID: ${{ secrets.TOOLBOX_AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.TOOLBOX_AWS_SECRET_ACCESS_KEY }}

- uses: actions/upload-artifact@v2
with:
Expand Down
14 changes: 2 additions & 12 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -211,18 +211,8 @@ release: clean-dist ## Build and publish final binaries and packages
# verify checksum signatures
.github/scripts/verify-signature.sh "$(DISTDIR)"

# create a version file for version-update checks
echo "$(VERSION)" > $(DISTDIR)/VERSION

# upload the version file that supports the application version update check
@docker run --rm \
-i \
-e AWS_DEFAULT_REGION=us-west-2 \
-e AWS_ACCESS_KEY_ID=${TOOLBOX_AWS_ACCESS_KEY_ID} \
-e AWS_SECRET_ACCESS_KEY=${TOOLBOX_AWS_SECRET_ACCESS_KEY} \
-v $(shell pwd)/$(DISTDIR)/:/distmount \
amazon/aws-cli --debug \
s3 cp /distmount/VERSION s3://toolbox-data.anchore.io/$(BIN)/releases/latest/VERSION
# upload the version file that supports the application version update check (excluding pre-releases)
.github/scripts/update-version-file.sh "$(DISTDIR)" "$(VERSION)"

.PHONY: clean
clean: clean-dist clean-snapshot ## Remove previous builds and result reports
Expand Down

0 comments on commit ad1a72c

Please # to comment.