Fix (ehh) release artifact filenames
version (Git tag) needs to be added manually because it doesn't exist when the Job runs
This commit is contained in:
parent
d8ccd4017a
commit
90c665f07c
|
@ -3,6 +3,7 @@
|
||||||
|
|
||||||
variables:
|
variables:
|
||||||
CI_HAWK_ARTIFACT_NAME: "BizHawk_devbuild_${CI_COMMIT_SHORT_SHA}"
|
CI_HAWK_ARTIFACT_NAME: "BizHawk_devbuild_${CI_COMMIT_SHORT_SHA}"
|
||||||
|
CI_HAWK_ARTIFACT_NAME_TAR: "$CI_HAWK_ARTIFACT_NAME.tar"
|
||||||
CI_HAWK_TMPARTIFACT_NAME: "BizHawk_tempbuild_${CI_COMMIT_REF_SLUG}_${CI_COMMIT_SHORT_SHA}"
|
CI_HAWK_TMPARTIFACT_NAME: "BizHawk_tempbuild_${CI_COMMIT_REF_SLUG}_${CI_COMMIT_SHORT_SHA}"
|
||||||
|
|
||||||
stages:
|
stages:
|
||||||
|
@ -72,9 +73,9 @@ check_style:
|
||||||
.package_linux_x64:
|
.package_linux_x64:
|
||||||
artifacts:
|
artifacts:
|
||||||
expire_in: "1 month"
|
expire_in: "1 month"
|
||||||
name: "$CI_HAWK_ARTIFACT_NAME.tar"
|
name: "$CI_HAWK_ARTIFACT_NAME"
|
||||||
paths:
|
paths:
|
||||||
- "$CI_HAWK_ARTIFACT_NAME.tar"
|
- "$CI_HAWK_ARTIFACT_NAME_TAR"
|
||||||
image: debian:buster-slim
|
image: debian:buster-slim
|
||||||
needs:
|
needs:
|
||||||
- build
|
- build
|
||||||
|
@ -82,7 +83,7 @@ check_style:
|
||||||
- su -c "apt-get update && apt-get -y install p7zip-full"
|
- su -c "apt-get update && apt-get -y install p7zip-full"
|
||||||
- Dist/Package.sh "linux-x64"
|
- Dist/Package.sh "linux-x64"
|
||||||
- cd packaged_output
|
- cd packaged_output
|
||||||
- tar -cf "../$CI_HAWK_ARTIFACT_NAME.tar" *
|
- tar -cf "../$CI_HAWK_ARTIFACT_NAME_TAR" *
|
||||||
stage: package
|
stage: package
|
||||||
|
|
||||||
.package_windows_x64:
|
.package_windows_x64:
|
||||||
|
@ -122,7 +123,8 @@ package_release_linux:
|
||||||
- if: $CI_COMMIT_REF_SLUG == "release"
|
- if: $CI_COMMIT_REF_SLUG == "release"
|
||||||
when: always
|
when: always
|
||||||
variables:
|
variables:
|
||||||
CI_HAWK_ARTIFACT_NAME: "BizHawk_release_${CI_COMMIT_SHORT_SHA}"
|
CI_HAWK_ARTIFACT_NAME: "BizHawk-VERSIONHERE-linux-x64.tar" # .zip is added automatically
|
||||||
|
CI_HAWK_ARTIFACT_NAME_TAR: "BizHawk-linux-x64-$CI_COMMIT_SHORT_SHA.tar"
|
||||||
|
|
||||||
package_release_windows:
|
package_release_windows:
|
||||||
extends: .package_windows_x64
|
extends: .package_windows_x64
|
||||||
|
@ -130,7 +132,7 @@ package_release_windows:
|
||||||
- if: $CI_COMMIT_REF_SLUG == "release"
|
- if: $CI_COMMIT_REF_SLUG == "release"
|
||||||
when: always
|
when: always
|
||||||
variables:
|
variables:
|
||||||
CI_HAWK_ARTIFACT_NAME: "BizHawk_release_${CI_COMMIT_SHORT_SHA}"
|
CI_HAWK_ARTIFACT_NAME: "BizHawk-VERSIONHERE-win-x64"
|
||||||
|
|
||||||
run_tests:
|
run_tests:
|
||||||
artifacts:
|
artifacts:
|
||||||
|
|
Loading…
Reference in New Issue