diff --git a/.ci_scripts/build_upload.ps1 b/.ci_scripts/build_upload.ps1 index 6d77137ce7..624cdf4ae6 100644 --- a/.ci_scripts/build_upload.ps1 +++ b/.ci_scripts/build_upload.ps1 @@ -30,7 +30,7 @@ if ("${env:COMPILER}" -eq "msvc") { CopyFile ext\SDL2\SDL2-${env:SDL_VERSION}\lib\x64\SDL2.dll . CopyFile ext\SDL2\SDL2_mixer-${env:SDL_MIXER_VERSION}\lib\x64\SDL2_mixer.dll . } elseif ("${env:COMPILER}" -eq "msvc-arm64") { - $suffix = "windows-msvc-arm64" + $suffix = "windows-arm64" CopyFile build/RelWithDebInfo/augustus.exe . CopyFile build/RelWithDebInfo/augustus.pdb . CopyFile ext\SDL2\SDL2\SDL2.dll . @@ -107,14 +107,14 @@ if (!$env:UPLOAD_TOKEN) { exit } -echo "Uploading $deploy_file to $repo/windows/$version" -curl -u "$env:UPLOAD_TOKEN" -T "deploy/$deploy_file" "https://augustus.josecadete.net/upload/$repo/windows/$version/${deploy_file}" +echo "Uploading $deploy_file to $repo/$suffix/$version" +curl -u "$env:UPLOAD_TOKEN" -T "deploy/$deploy_file" "https://augustus.josecadete.net/upload/$repo/$suffix/$version/${deploy_file}" if (!$?) { throw "Unable to upload" } echo "Uploaded. URL: https://augustus.josecadete.net/$repo.html" -if (!$packed_assets) { +if (!$packed_assets -and $suffix -eq "windows") { echo "Packing the assets" cd .\res\asset_packer diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c663010933..17cc760fd9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -133,7 +133,6 @@ jobs: - name: Windows MSVC ARM64 cache-key: msvc-arm64 COMPILER: msvc-arm64 - SKIP_UPLOAD: true name: ${{ matrix.name }} runs-on: windows-latest env: diff --git a/README.md b/README.md index 2f0e8b518f..2ca507098a 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,7 @@ Chat: [Discord](http://www.discord.gg/GamerZakh) (kindly hosted by GamerZakh) |----------|----------------|----------------| | Windows | [![Download](https://augustus.josecadete.net/badge/release/windows.svg)](https://augustus.josecadete.net/download/latest/release/windows) | [![Download](https://augustus.josecadete.net/badge/development/windows.svg)](https://augustus.josecadete.net/download/latest/development/windows) [(Download development assets)](https://augustus.josecadete.net/download/latest/development/assets) | | Linux AppImage | [![Download](https://augustus.josecadete.net/badge/release/linux-appimage.svg)](https://augustus.josecadete.net/download/latest/release/linux-appimage) | [![Download](https://augustus.josecadete.net/badge/development/linux-appimage.svg)](https://augustus.josecadete.net/download/latest/development/linux-appimage) +| Linux Flatpak | Next release! | [![Download](https://augustus.josecadete.net/badge/development/linux-flatpak.svg)](https://augustus.josecadete.net/download/latest/development/linux-flatpak) | Mac | [![Download](https://augustus.josecadete.net/badge/release/mac.svg)](https://augustus.josecadete.net/download/latest/release/mac) | [![Download](https://augustus.josecadete.net/badge/development/mac.svg)](https://augustus.josecadete.net/download/latest/development/mac) | | PS Vita | [![Download](https://augustus.josecadete.net/badge/release/vita.svg)](https://augustus.josecadete.net/download/latest/release/vita)| [![Download](https://augustus.josecadete.net/badge/development/vita.svg)](https://augustus.josecadete.net/download/latest/development/vita) | | Switch | [![Download](https://augustus.josecadete.net/badge/release/switch.svg)](https://augustus.josecadete.net/download/latest/release/switch) | [![Download](https://augustus.josecadete.net/badge/development/switch.svg)](https://augustus.josecadete.net/download/latest/development/switch) |