Manual release workflow + Makefile (+friends) respecting VERSION (#1957)

* Manual release workflow + Makefile (+friends) respecting VERSION

* Missed an 'on:'...

.github/workflows/manual-release.yml

@@ -0,0 +1,298 @@
+name: "Manual release"
+concurrency: release
+
+on:
+  workflow_dispatch:
+    inputs:
+      version:
+        description: 'Version string for the release'
+        required: true 
+        type: string
+env:
+  VERSION: ${{ inputs.version }}
+jobs:
+  release:
+    name: Create Release
+    runs-on: ubuntu-latest
+    outputs:
+      upload_url: ${{ steps.create_release.outputs.upload_url }}
+      release_already_exists: ${{ steps.tag_check.outputs.exists }}
+    steps:
+      - name: Get build timestamp
+        id: get-timestamp
+        uses: nanzm/[email protected]
+        with:
+          timeZone: 0
+          format: 'YYYY-MM-DD-HHmm'
+      - name: Generate environmental variables
+        id: generate_env_vars
+        run: |
+          if 
+            echo "::set-output name=tag_name::cbn-${{ inputs.version }}"
+            echo "::set-output name=release_name::Cataclysm-BN ${{ inputs.version }}"
+      - name: Check if there is existing git tag
+        id: tag_check
+        uses: mukunku/[email protected]
+        with:
+          tag: ${{ steps.generate_env_vars.outputs.tag_name }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - uses: actions/checkout@v2
+      - name: Push tag
+        id: tag_version
+        uses: mathieudutour/[email protected]
+        if: ${{ steps.tag_check.outputs.exists == 'false' }}
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          custom_tag: ${{ steps.generate_env_vars.outputs.tag_name }}
+          tag_prefix: ""
+      - uses: actions/checkout@v2
+      - run: git fetch origin tag ${{ steps.generate_env_vars.outputs.tag_name }} --no-tags
+      - name: Build Changelog
+        id: build_changelog
+        uses: mikepenz/[email protected]
+        with:
+          configuration: "changelog.json"
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Create release
+        id: create_release
+        uses: actions/create-release@v1
+        if: ${{ steps.tag_check.outputs.exists == 'false' }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ steps.generate_env_vars.outputs.tag_name }}
+          release_name: ${{ steps.generate_env_vars.outputs.release_name }}
+          body: |
+            ${{ steps.build_changelog.outputs.changelog }}
+            These are the outputs for the manually triggered build of commit [${{ github.sha }}](https://github.com/${{ github.repository }}/commit/${{ github.sha }})
+          draft: false
+          prerelease: false
+  builds:
+    needs: release
+    if: ${{ needs.release.outputs.release_already_exists == 'false' }}
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - name: Windows Tiles x64 MSVC
+            artifact: windows-tiles-x64-msvc
+            arch: x64
+            os: windows-2019
+            mxe: none
+            ext: zip
+            content: application/zip
+          - name: Windows Tiles x32 MSVC
+            artifact: windows-tiles-x32-msvc
+            arch: x86
+            os: windows-2019
+            mxe: none
+            ext: zip
+            content: application/zip
+          - name: Windows Tiles x64
+            mxe: x86_64
+            mxe_apt: x86-64
+            artifact: windows-tiles-x64
+            os: ubuntu-latest
+            ext: zip
+            content: application/zip
+          - name: Windows Tiles x32
+            mxe: i686
+            mxe_apt: i686
+            artifact: windows-tiles-x32
+            os: ubuntu-latest
+            ext: zip
+            content: application/zip
+          - name: Linux Tiles x64
+            os: ubuntu-18.04
+            mxe: none
+            android: none
+            tiles: 1
+            artifact: linux-tiles-x64
+            ext: tar.gz
+            content: application/gzip
+          - name: linux-curses-x64
+            os: ubuntu-18.04
+            mxe: none
+            android: none
+            tiles: 0
+            artifact: linux-curses-x64
+            ext: tar.gz
+            content: application/gzip
+          - name: osx-curses-x64
+            os: macos-11
+            mxe: none
+            tiles: 0
+            artifact: osx-curses-x64
+            ext: dmg
+            content: application/x-apple-diskimage
+          - name: osx-tiles-x64
+            os: macos-11
+            mxe: none
+            tiles: 1
+            artifact: osx-tiles-x64
+            ext: dmg
+            content: application/x-apple-diskimage
+          - name: Android x64
+            os: ubuntu-latest
+            mxe: none
+            android: arm64
+            artifact: android-x64
+            ext: apk
+            content: application/apk
+          - name: Android x32
+            os: ubuntu-latest
+            mxe: none
+            android: arm32
+            artifact: android-x32
+            ext: apk
+            content: application/apk
+          - name: Android Bundle
+            os: ubuntu-latest
+            mxe: none
+            android: bundle
+            artifact: android-bundle
+            ext: aab
+            content: application/aap
+    name: ${{ matrix.name }}
+    runs-on: ${{ matrix.os }}
+    env:
+        ZSTD_CLEVEL: 17
+    steps:
+      - uses: actions/checkout@v2
+      - name: Create VERSION.TXT
+        shell: bash
+        run: |
+          cat >VERSION.txt <<EOL
+          build type: ${{ matrix.artifact }}
+          build version string: ${{ inputs.version }}
+          commit sha: ${{ github.sha }}
+          commit url: https://github.com/${{ github.repository }}/commit/${{ github.sha }}
+          EOL
+      - name: Install dependencies (windows msvc) (1/3)
+        if: runner.os == 'Windows'
+        uses: microsoft/[email protected]
+      - name: Install dependencies (windows msvc) (2/3)
+        if: runner.os == 'Windows'
+        uses: lukka/run-vcpkg@main
+        id: runvcpkg
+        with:
+          additionalCachedPaths: '${{ runner.workspace }}/Cataclysm-BN/msvc-full-features/vcpkg_installed'
+          appendedCacheKey: ${{ hashFiles( 'msvc-full-features/vcpkg.json', '.github/vcpkg_triplets/**' ) }}-${{ matrix.arch }}-1
+          setupOnly: true
+          vcpkgDirectory: '${{ runner.workspace }}/b/vcpkg'
+          # We have to use at least this version of vcpkg to include fixes for yasm-tool's
+          # availability only as an x86 host tool. Keep it in sync with the builtin-baseline
+          # field in vcpkg.json. Caching happens as a post-action which runs at the end of
+          # the whole workflow, after vcpkg install happens during msbuild run.
+          vcpkgGitCommitId: '9d9a6f486cc7da7664117a75d01440db0088634a'
+      - name: Install dependencies (windows msvc) (3/3)
+        if: runner.os == 'Windows'
+        run: |
+          vcpkg integrate install
+      - name: Install dependencies (windows mxe)
+        if: matrix.mxe != 'none'
+        run: |
+          sudo apt update
+          sudo apt install astyle autoconf automake autopoint bash bison bzip2 cmake flex gettext git g++ gperf intltool \
+            libffi-dev libgdk-pixbuf2.0-dev libtool libltdl-dev libssl-dev libxml-parser-perl lzip make mingw-w64 openssl \
+            p7zip-full patch perl pkg-config python ruby scons sed unzip wget xz-utils g++-multilib libc6-dev-i386 libtool-bin
+      - name: Install MXE
+        if: matrix.mxe != 'none'
+        run: |
+          sudo apt install software-properties-common lsb-release
+          sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 86B72ED9
+          sudo add-apt-repository "deb [arch=amd64] https://pkg.mxe.cc/repos/apt `lsb_release -sc` main"
+          sudo apt update
+          sudo apt install mxe-${{ matrix.mxe_apt }}-w64-mingw32.static-{sdl2,sdl2-ttf,sdl2-image,sdl2-mixer,gettext}
+          curl -L -o libbacktrace-${{ matrix.mxe }}-w64-mingw32.tar.gz https://github.com/Qrox/libbacktrace/releases/download/2020-01-03/libbacktrace-${{ matrix.mxe }}-w64-mingw32.tar.gz
+          if ! shasum -a 256 -c ./build-scripts/libbacktrace-${{ matrix.mxe }}-w64-mingw32-sha256; then
+            echo "Checksum failed for libbacktrace-${{ matrix.mxe }}-w64-mingw32.tar.gz"
+            exit 1
+          fi
+          sudo tar -xzf libbacktrace-${{ matrix.mxe }}-w64-mingw32.tar.gz --exclude=LICENSE -C /usr/lib/mxe/usr/${{ matrix.mxe }}-w64-mingw32.static
+      - name: Install dependencies (Linux)
+        if: runner.os == 'Linux' && matrix.mxe == 'none' && matrix.android == 'none'
+        run: |
+          sudo apt-get update
+          sudo apt-get install libncursesw5-dev libsdl2-dev libsdl2-ttf-dev libsdl2-image-dev \
+            libsdl2-mixer-dev libpulse-dev ccache gettext parallel
+      - name: Install dependencies (mac)
+        if: runner.os == 'macOS'
+        run: |
+          HOMEBREW_NO_AUTO_UPDATE=yes HOMEBREW_NO_INSTALL_CLEANUP=yes brew install sdl2 sdl2_image sdl2_ttf sdl2_mixer gettext ccache parallel
+          pip3 install dmgbuild==1.4.2 biplist
+      - name: Compile translations (windows)
+        if: runner.os == 'Windows'
+        shell: bash
+        run: |
+          lang/compile_mo.sh all
+      - name: Build CBN (linux)
+        if: runner.os == 'Linux' && matrix.mxe == 'none' && matrix.android == 'none'
+        run: |
+          make -j$((`nproc`+0)) TILES=${{ matrix.tiles }} SOUND=${{ matrix.tiles }} RELEASE=1 LANGUAGES=all PCH=0 bindist
+          mv cataclysmbn-${{ inputs.version }}.tar.gz cbn-${{ matrix.artifact }}-${{ inputs.version }}.tar.gz
+      - name: Build CBN (windows)
+        if: matrix.mxe != 'none'
+        env:
+          PLATFORM: /usr/lib/mxe/usr/bin/${{ matrix.mxe }}-w64-mingw32.static-
+        run: |
+          make -j$((`nproc`+0)) CROSS="${PLATFORM}" TILES=1 SOUND=1 RELEASE=1 LANGUAGES=all PCH=0 bindist
+          mv cataclysmbn-${{ inputs.version }}.zip cbn-${{ matrix.artifact }}-${{ inputs.version }}.zip
+      - name: Build CBN (windows msvc)
+        if: runner.os == 'Windows'
+        env:
+          VCPKG_OVERLAY_TRIPLETS: ${{ github.workspace }}\.github\vcpkg_triplets
+        run: |
+          msbuild -m -p:Configuration=Release -p:Platform=${{ matrix.arch }} "-target:Cataclysm-vcpkg-static;JsonFormatter-vcpkg-static" msvc-full-features\Cataclysm-vcpkg-static.sln
+          .\build-scripts\windist.ps1
+          mv cataclysmbn.zip cbn-${{ matrix.artifact }}-${{ inputs.version }}.zip
+      - name: Build CBN (osx)
+        if: runner.os == 'macOS'
+        run: |
+          make -j3 TILES=${{ matrix.tiles }} SOUND=${{ matrix.tiles }} RELEASE=1 LANGUAGES=all USE_HOME_DIR=1 OSX_MIN=10.12 PCH=0 dmgdist COMPILER=clang++
+          mv CataclysmBN-${{ inputs.version }}.dmg cbn-${{ matrix.artifact }}-${{ inputs.version }}.dmg
+      - name: Set up JDK 8 (android)
+        if: runner.os == 'Linux' && matrix.android != 'none' && matrix.mxe == 'none'
+        uses: actions/setup-java@v2
+        with:
+          java-version: '8'
+          distribution: 'adopt'
+      - name: Setup Build and Dependencies (android)
+        if: runner.os == 'Linux' && matrix.android != 'none' && matrix.mxe == 'none'
+        run: |
+          sudo apt-get update
+          sudo apt-get install gettext
+      - name: Build CBN (android)
+        if: runner.os == 'Linux' && matrix.android != 'none' && matrix.mxe == 'none'
+        working-directory: ./android
+        run: |
+          echo "${{ secrets.KEYSTORE }}" > release.keystore.asc
+          gpg -d --passphrase "${{ secrets.KEYSTORE_PASSWORD }}" --batch release.keystore.asc > app/release.keystore
+          echo "${{ secrets.KEYSTORE_PROPERTIES }}" > keystore.properties.asc
+          gpg -d --passphrase "${{ secrets.KEYSTORE_PASSWORD }}" --batch keystore.properties.asc > keystore.properties
+          chmod +x gradlew
+          if [ ${{ matrix.android }} = arm64 ]
+          then
+               ./gradlew -Pj=$((`nproc`+0)) -Pabi_arm_32=false assembleStableRelease -Poverride_version=${{ inputs.version }}
+               mv ./app/build/outputs/apk/stable/release/*.apk ../cbn-${{ matrix.artifact }}-${{ inputs.version }}.apk
+          elif [ ${{ matrix.android }} = arm32 ]
+          then
+               ./gradlew -Pj=$((`nproc`+0)) -Pabi_arm_64=false assembleStableRelease -Poverride_version=${{ inputs.version }}
+               mv ./app/build/outputs/apk/stable/release/*.apk ../cbn-${{ matrix.artifact }}-${{ inputs.version }}.apk
+          elif [ ${{ matrix.android }} = bundle ]
+          then
+               ./gradlew -Pj=$((`nproc`+0)) assembleStableRelease -Poverride_version=${{ inputs.version }}
+               mv ./app/build/outputs/bundle/stable/*.aab ../cbn-${{ matrix.artifact }}-${{ inputs.version }}.aab
+          fi
+      - name: Upload release asset
+        id: upload-release-asset
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ needs.release.outputs.upload_url }}
+          asset_path: cbn-${{ matrix.artifact }}-${{ inputs.version }}.${{ matrix.ext }}
+          asset_name: cbn-${{ matrix.artifact }}-${{ inputs.version }}.${{ matrix.ext }}
+          asset_content_type: ${{ matrix.content }}

android/app/build.gradle

@@ -199,7 +199,7 @@ android {
         versionCode Integer.valueOf(System.env.UPSTREAM_BUILD_NUMBER ?: 1)
         versionName new File("$version_header_path").text.split('\"')[1]
         if (buildAsApplication) {
-            applicationId "com.cleverraven.cataclysmbn"
+            applicationId "com.cataclysmbnteam.cataclysmbn"
             setProperty("archivesBaseName", "cataclysmbn-" + versionName)
         }
         resValue "string", "app_name", "Cataclysm BN"

msvc-full-features/prebuild.cmd

@@ -5,9 +5,11 @@ cd ..\msvc-full-features
 echo Done
 
 echo Generating "version.h"...
+if "%VERSION%"=="" (
 for /F "tokens=*" %%i in ('git describe --tags --always --dirty --match "[0-9]*.*"') do set VERSION=%%i
+)
 if "%VERSION%"=="" (
-set VERSION=Please install `git` to generate VERSION
+set VERSION=Please install `git` to generate VERSION, or set the variable manually
 )
 echo VERSION defined as "%VERSION%"
 >..\src\version.h echo #define VERSION "%VERSION%"