Merge remote-tracking branch 'origin/master'

This commit is contained in:
Lynne Megido 2021-07-01 18:53:18 +10:00
commit f243cbba76
Signed by: lynnesbian
GPG Key ID: F0A184B5213D9F90

View File

@ -181,45 +181,45 @@ test-nightly:
# a) it's gross
# b) it probably won't work and i really don't want to partake in CI tomfoolery right now, or ever
build-release:
stage: release
cache: { }
rules:
- if: $CI_COMMIT_TAG
needs: ["test-stable"]
script:
- ./package.sh
artifacts:
paths:
- out/
#build-release:
# stage: release
# cache: { }
# rules:
# - if: $CI_COMMIT_TAG
# needs: ["test-stable"]
# script:
# - ./package.sh
# artifacts:
# paths:
# - out/
upload-release:
stage: release
cache: { }
rules:
- if: $CI_COMMIT_TAG
image: curlimages/curl:latest
script:
- git describe --tags --abbrev=0 | cut -c 2- > tmp
- |
cd out
for _bin in *.{zip,xz} do; curl --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file "$_bin" "${PACKAGE_REGISTRY_URL}/$(cat ../tmp)/${_bin}"; done
- rm ../tmp
#upload-release:
# stage: release
# cache: { }
# rules:
# - if: $CI_COMMIT_TAG
# image: curlimages/curl:latest
# script:
# - git describe --tags --abbrev=0 | cut -c 2- > tmp
# - |
# cd out
# for _bin in *.{zip,xz} do; curl --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file "$_bin" "${PACKAGE_REGISTRY_URL}/$(cat ../tmp)/${_bin}"; done
# - rm ../tmp
create-release:
stage: release
cache: {}
image: registry.gitlab.com/gitlab-org/release-cli:latest
rules:
- if: $CI_COMMIT_TAG
script:
- |
cd out
echo -n "release-cli create --name \"Release $CI_COMMIT_TAG\" --tag-name=\"$CI_COMMIT_TAG\" " > tmp.sh
git describe --tags --abbrev=0 | cut -c 2- > tmp
for _bin in *.{zip,xz}; do echo -n --assets-link \"\{\"name\":\"${_bin}\",\"url\":\"${PACKAGE_REGISTRY_URL}/$(cat tmp)/${_bin}\"\}\" >> tmp.sh; echo -n " " >> tmp.sh; done
- cat tmp.sh
- bash tmp.sh
- |
rm tmp.sh
rm tmp
#create-release:
# stage: release
# cache: {}
# image: registry.gitlab.com/gitlab-org/release-cli:latest
# rules:
# - if: $CI_COMMIT_TAG
# script:
# - |
# cd out
# echo -n "release-cli create --name \"Release $CI_COMMIT_TAG\" --tag-name=\"$CI_COMMIT_TAG\" " > tmp.sh
# git describe --tags --abbrev=0 | cut -c 2- > tmp
# for _bin in *.{zip,xz}; do echo -n --assets-link \"\{\"name\":\"${_bin}\",\"url\":\"${PACKAGE_REGISTRY_URL}/$(cat tmp)/${_bin}\"\}\" >> tmp.sh; echo -n " " >> tmp.sh; done
# - cat tmp.sh
# - bash tmp.sh
# - |
# rm tmp.sh
# rm tmp