1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-10 17:42:29 +01:00

Remove old upload code to prevent uploading twice

As we now upload in dedicated job to our own repo without any
intermediary, there's no need to keep the upload-build script nor the
steps executing it
This commit is contained in:
Michał Janiszewski
2024-10-10 23:33:33 +02:00
parent 1ae9bf2c26
commit ad0f703ca8
2 changed files with 2 additions and 86 deletions

View File

@@ -196,16 +196,13 @@ jobs:
with:
paths: "artifacts/test-**.xml"
if: matrix.platform != 'arm64'
- name: Upload artifacts (openrct2.org)
- name: Upload symbols (backtrace.io)
run: |
. scripts/setenv
if [[ "$OPENRCT2_PUSH" == "true" ]]; then
upload-build artifacts/OpenRCT2-${{ needs.build_variables.outputs.name }}-windows-portable-$PLATFORM.zip "windows-portable-$PLATFORM.zip" $OPENRCT2_VERSION $OPENRCT2_SHA1 $OPENRCT2_BRANCH
upload-build artifacts/OpenRCT2-${{ needs.build_variables.outputs.name }}-windows-installer-$PLATFORM.exe "windows-installer-$PLATFORM.exe" $OPENRCT2_VERSION $OPENRCT2_SHA1 $OPENRCT2_BRANCH
upload-build artifacts/OpenRCT2-${{ needs.build_variables.outputs.name }}-windows-symbols-$PLATFORM.zip "windows-symbols-$PLATFORM.zip" $OPENRCT2_VERSION $OPENRCT2_SHA1 $OPENRCT2_BRANCH
upload-backtrace-symbols artifacts/OpenRCT2-${{ needs.build_variables.outputs.name }}-windows-symbols-*.zip
else
echo 'Not going to push build'
echo 'Not going to push build'
fi
windows-mingw:
name: Windows (${{ matrix.platform_name }}) using mingw
@@ -341,14 +338,6 @@ jobs:
name: OpenRCT2-${{ needs.build_variables.outputs.name }}-${{ runner.os }}-universal
path: artifacts/OpenRCT2-${{ needs.build_variables.outputs.name }}-macos-universal.zip
if-no-files-found: error
- name: Upload artifacts (openrct2.org)
run: |
. scripts/setenv
if [[ "$OPENRCT2_PUSH" == "true" ]]; then
upload-build artifacts/OpenRCT2-${{ needs.build_variables.outputs.name }}-macos-universal.zip macos-universal.zip $OPENRCT2_VERSION $OPENRCT2_SHA1 $OPENRCT2_BRANCH
else
echo 'Not going to push build'
fi
linux-portable:
name: ${{ matrix.distro }} Linux (${{ matrix.release }}, ${{ matrix.platform }}, portable)
runs-on: ubuntu-latest
@@ -394,15 +383,6 @@ jobs:
if-no-files-found: error
- name: Run Tests
run: . scripts/setenv -q && run-tests
- name: Upload artifacts (openrct2.org)
run: |
# Build identification code: https://github.com/Limetric/OpenRCT2.org/blob/e5b738f3dadcc5a3b78e8dfd434756ff31eaa1d3/src/misc/releaseAsset.js#L94-L116
. scripts/setenv -q
if [[ "$OPENRCT2_PUSH" == "true" ]]; then
upload-build artifacts/OpenRCT2-${{ needs.build_variables.outputs.name }}-${{ runner.os }}-${{ matrix.release }}-${{ matrix.platform }}.tar.gz linux-${{ matrix.platform }}-${{ matrix.distro }}.tar.gz $OPENRCT2_VERSION $OPENRCT2_SHA1 $OPENRCT2_BRANCH
else
echo 'Not going to push build'
fi
linux-appimage:
name: Ubuntu Linux (AppImage, x86_64)
runs-on: ubuntu-latest
@@ -433,15 +413,6 @@ jobs:
name: OpenRCT2-${{ needs.build_variables.outputs.name }}-AppImage
path: artifacts
if-no-files-found: error
- name: Upload artifacts (openrct2.org)
run: |
# Build identification code: https://github.com/Limetric/OpenRCT2.org/blob/e5b738f3dadcc5a3b78e8dfd434756ff31eaa1d3/src/misc/releaseAsset.js#L94-L116
. scripts/setenv -q
if [[ "$OPENRCT2_PUSH" == "true" ]]; then
upload-build artifacts/OpenRCT2-${{ needs.build_variables.outputs.name }}-linux-x86_64.AppImage linux.AppImage $OPENRCT2_VERSION $OPENRCT2_SHA1 $OPENRCT2_BRANCH
else
echo 'Not going to push build'
fi
linux-docker:
name: Ubuntu Linux (Docker)
needs: check-code-formatting
@@ -552,14 +523,6 @@ jobs:
name: OpenRCT2-${{ needs.build_variables.outputs.name }}-Android
path: artifacts
if-no-files-found: error
- name: Upload artifacts (openrct2.org)
run: |
. scripts/setenv -q
if [[ "$OPENRCT2_PUSH" == "true" ]]; then
upload-build artifacts/OpenRCT2-${{ needs.build_variables.outputs.name }}-android-arm.apk android-arm.apk $OPENRCT2_VERSION $OPENRCT2_SHA1 $OPENRCT2_BRANCH
else
echo 'Not going to push build'
fi
release:
name: Release
runs-on: ubuntu-latest

View File

@@ -1,47 +0,0 @@
#!/usr/bin/env bash
set -e
if [[ "$#" -ne 4 && "$#" -ne 5 ]]; then
echo 'Upload an OpenRCT2 build to openrct2.org.'
echo ''
echo 'Usage: upload-build <path> <flavour> <version> <sha1> [<branch>]'
echo 'Flavours: windows-portable-x86, windows-portable-x64'
echo ' windows-installer-x86, windows-installer-x64'
echo ' windows-symbols-x86, windows-symbols-x64'
echo ' macos'
echo ' linux-i686, linux-x86_64'
echo ' android-arm, android-x86'
echo ''
echo 'Environment variable ''OPENRCT2_ORG_TOKEN'' must be set.'
exit 1
fi
path=$1
flavour=$2
version=$3
sha1=$4
branch=$5
if [ -n "$branch" ]; then
versionextra=-$branch-${sha1::10}
fi
filename=OpenRCT2-$version$versionextra-$flavour
echo -e "\033[0;36mUploading to openrct2.org as '$filename'..."
if [ -z "$OPENRCT2_ORG_TOKEN" ]; then
echo -e "\033[0;31mOPENRCT2_ORG_TOKEN not set"
exit 1
fi
# Use HTTP1.1 as a workaround for curl bug:
# https://github.com/actions/runner-images/issues/7329
# https://github.com/curl/curl/issues/10591
curl --include -m 300 --connect-timeout 5 -o - \
--http1.1 \
--form "key=$OPENRCT2_ORG_TOKEN" \
--form "fileName=$filename" \
--form "version=$version" \
--form "gitHash=$sha1" \
--form "gitBranch=$branch" \
--form "file=@$path" \
"https://openrct2.org/altapi/?command=push-build"