Skip to content

Commit 0671a3d

Browse files
authored
Merge pull request #1254 from smallstep/jdoss/Prerelease_fixes
Prerelease fixes
2 parents 35525cb + 6e72a38 commit 0671a3d

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

.github/workflows/release.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ jobs:
7171
uses: smallstep/workflows/.github/workflows/goreleaser.yml@main
7272
with:
7373
enable-packages-upload: true
74+
is-prerelease: ${{ needs.create_release.outputs.is_prerelease == 'true' }}
7475
secrets: inherit
7576

7677
build_upload_docker:

.goreleaser.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ before:
1313

1414
after:
1515
hooks:
16+
# This script depends on IS_PRERELEASE env being set. This is set by CI in the Is Pre-release step.
1617
- cmd: bash scripts/package-repo-import.sh {{ .Var.packageName }} {{ .Version }}
1718
output: true
1819

@@ -94,6 +95,7 @@ nfpms:
9495
# Package metadata: dpkg --info dist/step_....deb
9596
#
9697
- &NFPM
98+
id: packages
9799
builds:
98100
- nfpm
99101
package_name: "{{ .Var.packageName }}"
@@ -161,7 +163,6 @@ publishers:
161163
ids:
162164
- packages
163165
cmd: ./scripts/package-upload.sh {{ abs .ArtifactPath }} {{ .Var.packageName }} {{ .Version }} {{ .Var.packageRelease }}
164-
disable: "{{ if .Prerelease }}true{{ end }}"
165166

166167
snapshot:
167168
name_template: "{{ .Tag }}-next"

scripts/package-repo-import.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ check_package() {
4040
fi
4141
}
4242

43-
if [[ ${GORELEASER_PHASE} != "publish" ]]; then
44-
echo "Skipping artifact import; GORELEASER_PHASE is not 'publish'"
43+
if [[ ${IS_PRERELEASE} == "true" ]]; then
44+
echo "Skipping artifact import; IS_PRERELEASE is 'true'"
4545
exit 0;
4646
fi
4747

0 commit comments

Comments
 (0)