From 6da0a42a9233d4179e3666789959941c41c7f58c Mon Sep 17 00:00:00 2001 From: Baptiste Augrain Date: Tue, 30 Aug 2022 13:55:17 +0200 Subject: [PATCH] feat: port back changes made inside the insider branch (#1225) --- .github/workflows/insider-linux.yml | 8 ++++- .github/workflows/insider-macos.yml | 9 +++-- .github/workflows/insider-windows.yml | 9 +++-- build/build.sh | 10 +++--- build/build_docker.sh | 10 +++--- build/linux/appimage/build.sh | 2 +- build/windows/msi/build.sh | 16 ++++++--- .../msi/includes/vscodium-variables.wxi | 4 +-- .../msi/resources/insider/wix-banner.bmp | Bin 0 -> 85978 bytes .../msi/resources/insider/wix-dialog.bmp | Bin 0 -> 461898 bytes .../msi/resources/{ => stable}/wix-banner.bmp | Bin 85978 -> 85978 bytes .../msi/resources/{ => stable}/wix-dialog.bmp | Bin 461898 -> 461898 bytes build/windows/msi/vscodium.wxs | 2 +- build/windows/msi/vscodium.xsl | 8 ++--- get_repo.sh | 32 ++++++++++++++---- icons/build_icons.sh | 12 +++---- prepare_artifacts.sh | 2 +- release.sh | 8 ++--- 18 files changed, 86 insertions(+), 46 deletions(-) create mode 100644 build/windows/msi/resources/insider/wix-banner.bmp create mode 100644 build/windows/msi/resources/insider/wix-dialog.bmp rename build/windows/msi/resources/{ => stable}/wix-banner.bmp (91%) rename build/windows/msi/resources/{ => stable}/wix-dialog.bmp (95%) diff --git a/.github/workflows/insider-linux.yml b/.github/workflows/insider-linux.yml index fd39db5..e1f9dce 100644 --- a/.github/workflows/insider-linux.yml +++ b/.github/workflows/insider-linux.yml @@ -2,6 +2,10 @@ name: insider-linux on: workflow_dispatch: + inputs: + release_version: + type: string + description: Forced release version schedule: - cron: '0 1 * * *' push: @@ -53,6 +57,8 @@ jobs: run: npm install -g yarn - name: Clone VSCode repo + env: + RELEASE_VERSION: ${{ github.event.inputs.release_version }} run: ./get_repo.sh - name: Check PR or cron @@ -95,7 +101,7 @@ jobs: - name: Release env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.STRONGER_GITHUB_TOKEN }} run: ./release.sh if: env.SHOULD_BUILD == 'yes' && env.SHOULD_DEPLOY == 'yes' diff --git a/.github/workflows/insider-macos.yml b/.github/workflows/insider-macos.yml index 1227868..0b38e1f 100644 --- a/.github/workflows/insider-macos.yml +++ b/.github/workflows/insider-macos.yml @@ -2,6 +2,10 @@ name: insider-macos on: workflow_dispatch: + inputs: + release_version: + type: string + description: Forced release version schedule: - cron: '0 1 * * *' push: @@ -38,6 +42,8 @@ jobs: node-version: 16 - name: Clone VSCode repo + env: + RELEASE_VERSION: ${{ github.event.inputs.release_version }} run: . get_repo.sh - name: Check PR or cron @@ -46,7 +52,6 @@ jobs: - name: Check existing VSCodium tags/releases env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - NEW_RELEASE: ${{ github.event.inputs.new_release }} run: . check_tags.sh if: env.SHOULD_DEPLOY == 'yes' @@ -84,7 +89,7 @@ jobs: - name: Release env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.STRONGER_GITHUB_TOKEN }} run: ./release.sh if: env.SHOULD_BUILD == 'yes' && env.SHOULD_DEPLOY == 'yes' diff --git a/.github/workflows/insider-windows.yml b/.github/workflows/insider-windows.yml index 4b942fa..2ac657d 100644 --- a/.github/workflows/insider-windows.yml +++ b/.github/workflows/insider-windows.yml @@ -2,6 +2,10 @@ name: insider-windows on: workflow_dispatch: + inputs: + release_version: + type: string + description: Forced release version schedule: - cron: '0 1 * * *' push: @@ -48,6 +52,8 @@ jobs: python-version: '3.x' - name: Clone VSCode repo + env: + RELEASE_VERSION: ${{ github.event.inputs.release_version }} run: ./get_repo.sh - name: Check PR or cron @@ -56,7 +62,6 @@ jobs: - name: Check existing VSCodium tags/releases env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - NEW_RELEASE: ${{ github.event.inputs.new_release }} run: ./check_tags.sh if: env.SHOULD_DEPLOY == 'yes' @@ -92,7 +97,7 @@ jobs: - name: Release env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.STRONGER_GITHUB_TOKEN }} run: ./release.sh if: env.SHOULD_BUILD == 'yes' && env.SHOULD_DEPLOY == 'yes' diff --git a/build/build.sh b/build/build.sh index a598789..19c3d97 100755 --- a/build/build.sh +++ b/build/build.sh @@ -44,11 +44,11 @@ else export VSCODE_ARCH="x64" fi -echo "OS_NAME: ${OS_NAME}" -echo "SKIP_PACKAGES: ${SKIP_PACKAGES}" -echo "VSCODE_ARCH: ${VSCODE_ARCH}" -echo "VSCODE_LATEST: ${VSCODE_LATEST}" -echo "VSCODE_QUALITY: ${VSCODE_QUALITY}" +echo "OS_NAME=\"${OS_NAME}\"" +echo "SKIP_PACKAGES=\"${SKIP_PACKAGES}\"" +echo "VSCODE_ARCH=\"${VSCODE_ARCH}\"" +echo "VSCODE_LATEST=\"${VSCODE_LATEST}\"" +echo "VSCODE_QUALITY=\"${VSCODE_QUALITY}\"" rm -rf vscode* VSCode* diff --git a/build/build_docker.sh b/build/build_docker.sh index 527880b..8d14009 100755 --- a/build/build_docker.sh +++ b/build/build_docker.sh @@ -40,11 +40,11 @@ else export VSCODE_ARCH="armhf" fi -echo "OS_NAME: ${OS_NAME}" -echo "SKIP_PACKAGES: ${SKIP_PACKAGES}" -echo "VSCODE_ARCH: ${VSCODE_ARCH}" -echo "VSCODE_LATEST: ${VSCODE_LATEST}" -echo "VSCODE_QUALITY: ${VSCODE_QUALITY}" +echo "OS_NAME=\"${OS_NAME}\"" +echo "SKIP_PACKAGES=\"${SKIP_PACKAGES}\"" +echo "VSCODE_ARCH=\"${VSCODE_ARCH}\"" +echo "VSCODE_LATEST=\"${VSCODE_LATEST}\"" +echo "VSCODE_QUALITY=\"${VSCODE_QUALITY}\"" rm -rf vscode* VSCode* diff --git a/build/linux/appimage/build.sh b/build/linux/appimage/build.sh index 596e458..90e2776 100755 --- a/build/linux/appimage/build.sh +++ b/build/linux/appimage/build.sh @@ -19,7 +19,7 @@ if [[ "${VSCODE_ARCH}" == "x64" ]]; then sed -i 's/grep docker/# grep docker/' pkg2appimage.AppDir/usr/share/pkg2appimage/functions.sh if [[ "${VSCODE_QUALITY}" == "insider" ]]; then - sed -i 's|@@NAME@@|VSCodium - Insiders|g' recipe.yml + sed -i 's|@@NAME@@|VSCodium-Insiders|g' recipe.yml sed -i 's|@@APPNAME@@|codium-insiders|g' recipe.yml sed -i 's|@@ICON@@|vscodium-insiders|g' recipe.yml else diff --git a/build/windows/msi/build.sh b/build/windows/msi/build.sh index 2bc79c3..f43cc11 100644 --- a/build/windows/msi/build.sh +++ b/build/windows/msi/build.sh @@ -12,11 +12,15 @@ WIN_SDK_FULL_VERSION="10.0.17763.0" if [[ "${VSCODE_QUALITY}" == "insider" ]]; then PRODUCT_NAME="VSCodium - Insiders" PRODUCT_SKU="vscodium-insiders" + PRODUCT_UPGRADE_CODE="1C9B7195-5A9A-43B3-B4BD-583E20498467" ICON_DIR="..\\..\\..\\src\\insider\\resources\\win32" + SETUP_RESOURCES_DIR=".\\resources\\insider" else PRODUCT_NAME="VSCodium" PRODUCT_SKU="vscodium" + PRODUCT_UPGRADE_CODE="965370CD-253C-4720-82FC-2E6B02A53808" ICON_DIR="..\\..\\..\\src\\stable\\resources\\win32" + SETUP_RESOURCES_DIR=".\\resources\\stable" fi PRODUCT_ID=$( powershell.exe -command "[guid]::NewGuid().ToString().ToUpper()" ) @@ -26,15 +30,14 @@ CULTURE="en-us" LANGIDS="1033" SETUP_RELEASE_DIR=".\\releasedir" -SETUP_RESOURCES_DIR=".\\resources" BINARY_DIR="..\\..\\..\\VSCode-win32-${VSCODE_ARCH}" LICENSE_DIR="..\\..\\..\\vscode" PROGRAM_FILES_86=$( env | sed -n 's/^ProgramFiles(x86)=//p' ) if [[ -z "${1}" ]]; then - OUTPUT_BASE_FILENAME="${PRODUCT_NAME}-${VSCODE_ARCH}-${RELEASE_VERSION}" + OUTPUT_BASE_FILENAME="VSCodium-${VSCODE_ARCH}-${RELEASE_VERSION}" else - OUTPUT_BASE_FILENAME="${PRODUCT_NAME}-${VSCODE_ARCH}-${1}-${RELEASE_VERSION}" + OUTPUT_BASE_FILENAME="VSCodium-${VSCODE_ARCH}-${1}-${RELEASE_VERSION}" fi if [[ "${VSCODE_ARCH}" == "ia32" ]]; then @@ -43,7 +46,10 @@ else export PLATFORM="${VSCODE_ARCH}" fi -sed -i "s|@@PRODUCT_NAME@@|${PRODUCT_NAME}|g" .\\i18n\\*.wsl +sed -i "s|@@PRODUCT_UPGRADE_CODE@@|${PRODUCT_UPGRADE_CODE}|g" .\\includes\\vscodium-variables.wxi +sed -i "s|@@PRODUCT_NAME@@|${PRODUCT_NAME}|g" .\\vscodium.xsl + +find i18n -name '*.wxl' -exec sed -i "s|@@PRODUCT_NAME@@|${PRODUCT_NAME}|g" {} \; BuildSetupTranslationTransform() { local CULTURE=${1} @@ -53,7 +59,7 @@ BuildSetupTranslationTransform() { echo "Building setup translation for culture \"${CULTURE}\" with LangID \"${LANGID}\"..." - "${WIX}bin\\light.exe" vscodium.wixobj "Files-${OUTPUT_BASE_FILENAME}.wixobj" -ext WixUIExtension -ext WixUtilExtension -ext WixNetFxExtension -spdb -cc "${TEMP}\\vscodium-cab-cache\\${PLATFORM}" -reusecab -out "${SETUP_RELEASE_DIR}\\${OUTPUT_BASE_FILENAME}.${CULTURE}.msi" -loc "i18n\\${PRODUCT_SKU}.${CULTURE}.wxl" -cultures:"${CULTURE}" -sice:ICE60 -sice:ICE69 + "${WIX}bin\\light.exe" vscodium.wixobj "Files-${OUTPUT_BASE_FILENAME}.wixobj" -ext WixUIExtension -ext WixUtilExtension -ext WixNetFxExtension -spdb -cc "${TEMP}\\vscodium-cab-cache\\${PLATFORM}" -reusecab -out "${SETUP_RELEASE_DIR}\\${OUTPUT_BASE_FILENAME}.${CULTURE}.msi" -loc "i18n\\vscodium.${CULTURE}.wxl" -cultures:"${CULTURE}" -sice:ICE60 -sice:ICE69 cscript "${PROGRAM_FILES_86}\\Windows Kits\\${WIN_SDK_MAJOR_VERSION}\\bin\\${WIN_SDK_FULL_VERSION}\\${PLATFORM}\\WiLangId.vbs" "${SETUP_RELEASE_DIR}\\${OUTPUT_BASE_FILENAME}.${CULTURE}.msi" Product "${LANGID}" diff --git a/build/windows/msi/includes/vscodium-variables.wxi b/build/windows/msi/includes/vscodium-variables.wxi index 13968a5..5e9328e 100644 --- a/build/windows/msi/includes/vscodium-variables.wxi +++ b/build/windows/msi/includes/vscodium-variables.wxi @@ -22,6 +22,6 @@ - + - \ No newline at end of file + diff --git a/build/windows/msi/resources/insider/wix-banner.bmp b/build/windows/msi/resources/insider/wix-banner.bmp new file mode 100644 index 0000000000000000000000000000000000000000..fa9346376fb13f29d27fafcd7e44e27d15d50441 GIT binary patch literal 85978 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 literal 0 HcmV?d00001 diff --git a/build/windows/msi/resources/insider/wix-dialog.bmp b/build/windows/msi/resources/insider/wix-dialog.bmp new file mode 100644 index 0000000000000000000000000000000000000000..3e7582207818c6ff14d24e3d5d3f622c4c48c07b GIT binary patch literal 461898 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 Js|Z~8{{XQuo=^Y) literal 0 HcmV?d00001 diff --git a/build/windows/msi/resources/wix-banner.bmp b/build/windows/msi/resources/stable/wix-banner.bmp similarity index 91% rename from build/windows/msi/resources/wix-banner.bmp rename to build/windows/msi/resources/stable/wix-banner.bmp index 436e0f7515baa6e0e2526fb25c27ec3f7289753c..d18cb8bd0bfb33c0e68466c8845da01c6f2d307f 100644 GIT binary patch literal 85978 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 diff --git a/build/windows/msi/resources/wix-dialog.bmp b/build/windows/msi/resources/stable/wix-dialog.bmp similarity index 95% rename from build/windows/msi/resources/wix-dialog.bmp rename to build/windows/msi/resources/stable/wix-dialog.bmp index 3fbe65629f9bbaa35054ae0332a6adc33cd950a8..be59832ccbe4aed4daded60b40a88d4c793f3c81 100644 GIT binary patch literal 461898 zcmeI*S8yEHz2|Ycc5AmbylrjOK5gy8*4Do6wZ%*@0R%HCnWQMo3RgK@$(Cfvy0&Bm z`%0Fqz?=z25CjMY03-kc3}DWgVkRYunZ)$z>B*tF|1&cH27w^m7J+Wy%WBbs!JL`X zpELDi`}7HeN00cg|M4OH=L`AokMdvr&mMZHm;Cp$hyI6t`k^iVCH?!<4~>7_dFY|^ zp`W=kIRDYNKiV4nzt2?t&;S0v{&MSQ1AqSW|Mt;~FaDo_FTVI67S5jipZfjhlmG62 z|N5JMYAh}f{(bfj`c3$Q00Iag;AH`F+{>*;-4Q?lfjf7|alQozAb^0k1;}x4w;#1f z009KZalQixAb^0k1;}x4w;#1f009KZalQixAb^0k1;}x4w;#1f009KZalQixAb^0k z1;}x4w;#1f009KZalQixAb^0k1;}x4w;#1f009KZalQixAb^0k1;}x4w;#1f009KZ zalQixAb^0k1;}x4w;#1f009KZalQixAb^0k1;}x4w;#1f009KZalQixAb^0k1;}x4 zw;#1f009KZalQixAb^0k1;}x4w;#1f009KZalQixAb^0k1;}x4w;#1f009KZalQix zAb^0k1;}x4w;#1f009KZalQixAb^0k1;}x4w;#1f009KZalQixAb^0k1;}x4w;#1f z009KZalQixAb^0k1;}x4w;#1f009KZalQixAb^0k1;}x4w;#1f009KZalQixAb^0k z1;}x4w;#1f009KZalQixAb^0k1;}x4w;#1f009KZalQixAb^0k1;}x4w;#1f009KZ zalQixAb^0k1;}x4w;#1f009KZalQixAb^0k1;}x4w;#1f009KZalQixAb^0k1;}x4 zw;#1f009KZalQixAb^0k1;}x4w;#1f009KZalQixAb^0k1;}x4w;#1f009KZalQix zAb^0k1;}x4w;#1f009KZalQixAb^0k1;}x4w;#1f009KZalQixAb^0k1;}x4w;#1f z009KZalQixAb^0k1;}x4w;#1f009KZalQixAb^0k1;}x4w;#1f009KZalQixAb^0k z1;}x4w;#1f009KZalQixAb^0k1;}x4w;#1f009KZalQixAb^0k1;}x4w;#1f009KZ zalQixAb^0k1;}x4w;#1f009KZalQixAb^0k1;}x4w;#1f009KLM2_2bQvDd-TM(#t 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 diff --git a/build/windows/msi/vscodium.wxs b/build/windows/msi/vscodium.wxs index f7b10a2..bbe9719 100644 --- a/build/windows/msi/vscodium.wxs +++ b/build/windows/msi/vscodium.wxs @@ -1110,7 +1110,7 @@ - + diff --git a/build/windows/msi/vscodium.xsl b/build/windows/msi/vscodium.xsl index 787a224..87ec399 100644 --- a/build/windows/msi/vscodium.xsl +++ b/build/windows/msi/vscodium.xsl @@ -1,17 +1,17 @@ - - + - + VSCODIUM.EXE @@ -19,7 +19,7 @@ - + VSCODIUM.EXE diff --git a/get_repo.sh b/get_repo.sh index ee4b605..f861aea 100755 --- a/get_repo.sh +++ b/get_repo.sh @@ -32,16 +32,33 @@ if [[ -z "${RELEASE_VERSION}" ]]; then export RELEASE_VERSION="${MS_TAG}.${date: -5}" fi else - if [[ "${RELEASE_VERSION}" =~ ^([0-9]+\.[0-9]+\.[0-9]+)\.[0-9]+$ ]]; - then - MS_TAG="${BASH_REMATCH[1]}" + if [[ "${VSCODE_QUALITY}" == "insider" ]]; then + if [[ "${RELEASE_VERSION}" =~ ^([0-9]+\.[0-9]+\.[0-9]+)\.[0-9]+-insider$ ]]; + then + MS_TAG="${BASH_REMATCH[1]}" + else + echo "Bad RELEASE_VERSION: ${RELEASE_VERSION}" + exit 1 + fi + + if [[ "${MS_TAG}" == "$(jq -r '.tag' insider.json)" ]]; then + export MS_COMMIT=$(jq -r '.commit' insider.json) + else + echo "No MS_COMMIT for ${RELEASE_VERSION}" + exit 1 + fi else - echo "Bad RELEASE_VERSION: ${RELEASE_VERSION}" - exit 1 + if [[ "${RELEASE_VERSION}" =~ ^([0-9]+\.[0-9]+\.[0-9]+)\.[0-9]+$ ]]; + then + MS_TAG="${BASH_REMATCH[1]}" + else + echo "Bad RELEASE_VERSION: ${RELEASE_VERSION}" + exit 1 + fi fi fi -echo "Release version: ${RELEASE_VERSION}" +echo "RELEASE_VERSION=\"${RELEASE_VERSION}\"" mkdir -p vscode cd vscode || { echo "'vscode' dir not found"; exit 1; } @@ -73,7 +90,8 @@ elif [[ -z "${MS_COMMIT}" ]]; then fi fi -echo "Got the MS tag: ${MS_TAG} version: ${MS_COMMIT}" +echo "MS_TAG=\"${MS_TAG}\"" +echo "MS_COMMIT=\"${MS_COMMIT}\"" git fetch --depth 1 origin "${MS_COMMIT}" git checkout FETCH_HEAD diff --git a/icons/build_icons.sh b/icons/build_icons.sh index 7729150..1e4a598 100755 --- a/icons/build_icons.sh +++ b/icons/build_icons.sh @@ -146,13 +146,13 @@ build_win32() { convert -size 138x140 xc:white "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-small-250.bmp" composite -size 116x -gravity center "icons/${QUALITY}/codium_only.svg" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-small-250.bmp" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-small-250.bmp" fi - if [ ! -f "${SRC_PREFIX}build/windows/msi/resources/wix-banner.bmp" ]; then - convert -size 493x58 xc:white "${SRC_PREFIX}build/windows/msi/resources/wix-banner.bmp" - composite -geometry +438+6 \( "icons/${QUALITY}/codium_only.svg" -resize 50x50 \) "${SRC_PREFIX}build/windows/msi/resources/wix-banner.bmp" "${SRC_PREFIX}build/windows/msi/resources/wix-banner.bmp" + if [ ! -f "${SRC_PREFIX}build/windows/msi/resources/${QUALITY}/wix-banner.bmp" ]; then + convert -size 493x58 xc:white "${SRC_PREFIX}build/windows/msi/resources/${QUALITY}/wix-banner.bmp" + composite -geometry +438+6 \( "icons/${QUALITY}/codium_only.svg" -resize 50x50 \) "${SRC_PREFIX}build/windows/msi/resources/${QUALITY}/wix-banner.bmp" "${SRC_PREFIX}build/windows/msi/resources/${QUALITY}/wix-banner.bmp" fi - if [ ! -f "${SRC_PREFIX}build/windows/msi/resources/wix-dialog.bmp" ]; then - convert -size 493x312 xc:white "${SRC_PREFIX}build/windows/msi/resources/wix-dialog.bmp" - composite -geometry +22+152 \( "icons/${QUALITY}/codium_only.svg" -resize 120x90 \) "${SRC_PREFIX}build/windows/msi/resources/wix-dialog.bmp" "${SRC_PREFIX}build/windows/msi/resources/wix-dialog.bmp" + if [ ! -f "${SRC_PREFIX}build/windows/msi/resources/${QUALITY}/wix-dialog.bmp" ]; then + convert -size 493x312 xc:white "${SRC_PREFIX}build/windows/msi/resources/${QUALITY}/wix-dialog.bmp" + composite -geometry +22+152 \( "icons/${QUALITY}/codium_only.svg" -resize 120x90 \) "${SRC_PREFIX}build/windows/msi/resources/${QUALITY}/wix-dialog.bmp" "${SRC_PREFIX}build/windows/msi/resources/${QUALITY}/wix-dialog.bmp" fi } diff --git a/prepare_artifacts.sh b/prepare_artifacts.sh index eb6775e..608bd66 100755 --- a/prepare_artifacts.sh +++ b/prepare_artifacts.sh @@ -148,7 +148,7 @@ else echo "Moving AppImage" mv build/linux/appimage/out/*.AppImage* artifacts/ - rename '_-_' '-' artifacts/*.AppImage + find artifacts -name '*.AppImage*' -exec bash -c 'mv $0 ${0/_-_/-}' {} \; fi VSCODE_PLATFORM="linux" diff --git a/release.sh b/release.sh index c75c05d..54090cf 100755 --- a/release.sh +++ b/release.sh @@ -18,9 +18,9 @@ fi npm install -g github-release-cli -if [[ $( gh release view "${RELEASE_VERSION}" 2>&1 ) =~ "release not found" ]]; then +if [[ $( gh release view --repo "${OWNER}/${REPOSITORY}" "${RELEASE_VERSION}" 2>&1 ) =~ "release not found" ]]; then echo "Creating release '${RELEASE_VERSION}'" - gh release create --repo "${REPOSITORY}" "${RELEASE_VERSION}" + gh release create --repo "${OWNER}/${REPOSITORY}" "${RELEASE_VERSION}" fi cd artifacts @@ -31,7 +31,7 @@ for FILE in * do if [[ -f "${FILE}" ]] && [[ "${FILE}" != *.sha1 ]] && [[ "${FILE}" != *.sha256 ]]; then echo "::group::Uploading '${FILE}' at $( date "+%T" )" - gh release upload --repo "${REPOSITORY}" "${RELEASE_VERSION}" "${FILE}" "${FILE}.sha1" "${FILE}.sha256" + gh release upload --repo "${OWNER}/${REPOSITORY}" "${RELEASE_VERSION}" "${FILE}" "${FILE}.sha1" "${FILE}.sha256" EXIT_STATUS=$? echo "exit: ${EXIT_STATUS}" @@ -44,7 +44,7 @@ do sleep $(( 15 * (i + 1))) echo "RE-Uploading '${FILE}' at $( date "+%T" )" - gh release upload --repo "${REPOSITORY}" "${RELEASE_VERSION}" "${FILE}" "${FILE}.sha1" "${FILE}.sha256" + gh release upload --repo "${OWNER}/${REPOSITORY}" "${RELEASE_VERSION}" "${FILE}" "${FILE}.sha1" "${FILE}.sha256" EXIT_STATUS=$? echo "exit: ${EXIT_STATUS}"