From 7a77819db17638a3e6e724787be444b844437909 Mon Sep 17 00:00:00 2001
From: Alex Aubuchon <alex@aub.dev>
Date: Tue, 4 May 2021 20:23:35 -0400
Subject: [PATCH 01/13] Add windows experimental release action (#48705)

---
 .github/workflows/release.yml | 80 +++++++++++++++++++++++++++++++++++
 1 file changed, 80 insertions(+)
 create mode 100644 .github/workflows/release.yml

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
new file mode 100644
index 000000000000..f75550438cee
--- /dev/null
+++ b/.github/workflows/release.yml
@@ -0,0 +1,80 @@
+name: "Experimental Release"
+on:
+  push:
+    branches:
+      - master
+jobs:
+  release:
+    name: Create Release
+    runs-on: ubuntu-latest
+    outputs:
+      upload_url: ${{ steps.create_release.outputs.upload_url }}
+    steps:
+      - uses: actions/checkout@v2
+      - name: Push tag
+        id: tag_version
+        uses: mathieudutour/github-tag-action@v5.5
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          custom_tag: ${{ github.run_number }}
+          tag_prefix: experimental-
+      - name: Create release
+        id: create_release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ steps.tag_version.outputs.new_tag }}
+          release_name: "Experimental Build #${{ github.run_number }}"
+          body: |
+            These are the outputs for the experimental build of commit [${{ github.sha }}](https://github.com/${{ github.repository }}/commit/${{ github.sha }})
+          draft: false
+          prerelease: true
+  windows:
+    needs: release
+    strategy:
+      matrix:
+        include:
+          - name: Windows Tiles x64
+            mxe: x86_64
+            artifact: windows-tiles-x64
+          - name: Windows Tiles x32
+            mxe: i686
+            artifact: windows-tiles-x32
+    name: ${{ matrix.name }}
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install dependencies
+        run: |
+          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
+        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-{i686,x86-64}-w64-mingw32.static-{sdl2,sdl2-ttf,sdl2-image,sdl2-mixer,gettext}
+      - name: Build CDDA
+        env:
+          PLATFORM: /usr/lib/mxe/usr/bin/${{ matrix.mxe }}-w64-mingw32.static-
+        run: |
+          cat >VERSION.txt <<EOL
+          build type: ${{ matrix.artifact }}
+          build number: ${{ github.run_number }}
+          commit sha: ${{ github.sha }}
+          commit url: https://github.com/${{ github.repository }}/commit/${{ github.sha }}
+          EOL
+
+          make -j$((`nproc`+0)) CROSS="${PLATFORM}" TILES=1 SOUND=1 RELEASE=1 LOCALIZE=1 BACKTRACE=0 PCH=0 bindist
+          mv cataclysmdda-0.E.zip cdda-${{ matrix.artifact }}-b${{ github.run_number }}.zip
+      - 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: cdda-${{ matrix.artifact }}-b${{ github.run_number }}.zip
+          asset_name: cdda-${{ matrix.artifact }}-b${{ github.run_number }}.zip
+          asset_content_type: application/zip

From 902d3621280b851d7fd7d40d9f20fb8f760d09aa Mon Sep 17 00:00:00 2001
From: Alex Aubuchon <alex@aub.dev>
Date: Thu, 6 May 2021 01:05:44 -0400
Subject: [PATCH 02/13] Add LANGUAGES=all to windows experimental release build
 (#48763)

---
 .github/workflows/release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index f75550438cee..d30b2f7f7036 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -66,7 +66,7 @@ jobs:
           commit url: https://github.com/${{ github.repository }}/commit/${{ github.sha }}
           EOL
 
-          make -j$((`nproc`+0)) CROSS="${PLATFORM}" TILES=1 SOUND=1 RELEASE=1 LOCALIZE=1 BACKTRACE=0 PCH=0 bindist
+          make -j$((`nproc`+0)) CROSS="${PLATFORM}" TILES=1 SOUND=1 RELEASE=1 LOCALIZE=1 LANGUAGES=all BACKTRACE=0 PCH=0 bindist
           mv cataclysmdda-0.E.zip cdda-${{ matrix.artifact }}-b${{ github.run_number }}.zip
       - name: Upload release asset
         id: upload-release-asset 

From 455d85b3ac276b04a900c37a4242e89b6cb22659 Mon Sep 17 00:00:00 2001
From: Kevin Granade <kevin.granade@gmail.com>
Date: Thu, 6 May 2021 12:31:48 -0700
Subject: [PATCH 03/13] Update release.yml (#48775)

---
 .github/workflows/release.yml | 57 ++++++++++++++++++++++++++++++-----
 1 file changed, 49 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index d30b2f7f7036..554164b7c185 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -30,7 +30,7 @@ jobs:
             These are the outputs for the experimental build of commit [${{ github.sha }}](https://github.com/${{ github.repository }}/commit/${{ github.sha }})
           draft: false
           prerelease: true
-  windows:
+  builds:
     needs: release
     strategy:
       matrix:
@@ -38,24 +38,66 @@ jobs:
           - name: Windows Tiles x64
             mxe: x86_64
             artifact: windows-tiles-x64
+            os: windows
+            ext: zip
+            content: application/zip
           - name: Windows Tiles x32
             mxe: i686
             artifact: windows-tiles-x32
+            os: windows
+            ext: zip
+            content: application/zip
+          - name: Linux Tiles x64
+            os: linux
+            mxe: none
+            tiles: 1
+            artifact: linux-tiles-x64
+            ext: tar.gz
+            content: application/gzip
+          - name: linux-curses-x64
+            os: linux
+            mxe: none
+            tiles: 0
+            artifact: linux-curses-x64
+            ext: tar.gz
+            content: application/gzip
     name: ${{ matrix.name }}
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Install dependencies
+      - name: Install dependencies (windows)
+        if: matrix.os == 'windows'
         run: |
-          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
+          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-{i686,x86-64}-w64-mingw32.static-{sdl2,sdl2-ttf,sdl2-image,sdl2-mixer,gettext}
-      - name: Build CDDA
+      - name: Install dependencies (Linux)
+        if: matrix.os == 'linux'
+        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: Build CDDA (linux)
+        if: matrix.os == 'linux'
+        run: |
+          cat >VERSION.txt <<EOL
+          build type: ${{ matrix.artifact }}
+          build number: ${{ github.run_number }}
+          commit sha: ${{ github.sha }}
+          commit url: https://github.com/${{ github.repository }}/commit/${{ github.sha }}
+          EOL
+          make -j$((`nproc`+0)) TILES=${{ matrix.tiles }} SOUND=${{ matrix.tiles }} RELEASE=1 LOCALIZE=1 LANGUAGES=all BACKTRACE=0 PCH=0 bindist
+          mv cataclysmdda-0.E.tar.gz cdda-${{ matrix.artifact }}-b${{ github.run_number }}.tar.gz
+      - name: Build CDDA (windows)
+        if: matrix.os == 'windows'
         env:
           PLATFORM: /usr/lib/mxe/usr/bin/${{ matrix.mxe }}-w64-mingw32.static-
         run: |
@@ -65,7 +107,6 @@ jobs:
           commit sha: ${{ github.sha }}
           commit url: https://github.com/${{ github.repository }}/commit/${{ github.sha }}
           EOL
-
           make -j$((`nproc`+0)) CROSS="${PLATFORM}" TILES=1 SOUND=1 RELEASE=1 LOCALIZE=1 LANGUAGES=all BACKTRACE=0 PCH=0 bindist
           mv cataclysmdda-0.E.zip cdda-${{ matrix.artifact }}-b${{ github.run_number }}.zip
       - name: Upload release asset
@@ -75,6 +116,6 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ needs.release.outputs.upload_url }} 
-          asset_path: cdda-${{ matrix.artifact }}-b${{ github.run_number }}.zip
-          asset_name: cdda-${{ matrix.artifact }}-b${{ github.run_number }}.zip
-          asset_content_type: application/zip
+          asset_path: cdda-${{ matrix.artifact }}-b${{ github.run_number }}.${{ matrix.ext }}
+          asset_name: cdda-${{ matrix.artifact }}-b${{ github.run_number }}.${{ matrix.ext }}
+          asset_content_type: ${{ matrix.content }}

From 57b14e36a1728912b41d53e32ffcce7e9549ebd9 Mon Sep 17 00:00:00 2001
From: Kevin Granade <kevin.granade@gmail.com>
Date: Fri, 7 May 2021 21:08:34 -0700
Subject: [PATCH 04/13] Add osx build to release workflow (#48784)

---
 .github/workflows/release.yml | 48 ++++++++++++++++++++++++++++-------
 1 file changed, 39 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 554164b7c185..e988e0790456 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -38,35 +38,49 @@ jobs:
           - name: Windows Tiles x64
             mxe: x86_64
             artifact: windows-tiles-x64
-            os: windows
+            os: ubuntu-latest
             ext: zip
             content: application/zip
           - name: Windows Tiles x32
             mxe: i686
             artifact: windows-tiles-x32
-            os: windows
+            os: ubuntu-latest
             ext: zip
             content: application/zip
           - name: Linux Tiles x64
-            os: linux
+            os: ubuntu-latest
             mxe: none
             tiles: 1
             artifact: linux-tiles-x64
             ext: tar.gz
             content: application/gzip
           - name: linux-curses-x64
-            os: linux
+            os: ubuntu-latest
             mxe: none
             tiles: 0
             artifact: linux-curses-x64
             ext: tar.gz
             content: application/gzip
+          - name: osx-curses-x64
+            os: macos-10.15
+            mxe: none
+            tiles: 0
+            artifact: osx-curses-x64
+            ext: dmg
+            content: application/x-apple-diskimage
+          - name: osx-tiles-x64
+            os: macos-10.15
+            mxe: none
+            tiles: 1
+            artifact: osx-tiles-x64
+            ext: dmg
+            content: application/x-apple-diskimage
     name: ${{ matrix.name }}
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2
       - name: Install dependencies (windows)
-        if: matrix.os == 'windows'
+        if: matrix.mxe != 'none'
         run: |
           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 \
@@ -80,13 +94,18 @@ jobs:
           sudo apt update
           sudo apt install mxe-{i686,x86-64}-w64-mingw32.static-{sdl2,sdl2-ttf,sdl2-image,sdl2-mixer,gettext}
       - name: Install dependencies (Linux)
-        if: matrix.os == 'linux'
+        if: runner.os == 'Linux' && matrix.mxe == '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 biplist
       - name: Build CDDA (linux)
-        if: matrix.os == 'linux'
+        if: runner.os == 'Linux' && matrix.mxe == 'none'
         run: |
           cat >VERSION.txt <<EOL
           build type: ${{ matrix.artifact }}
@@ -97,7 +116,7 @@ jobs:
           make -j$((`nproc`+0)) TILES=${{ matrix.tiles }} SOUND=${{ matrix.tiles }} RELEASE=1 LOCALIZE=1 LANGUAGES=all BACKTRACE=0 PCH=0 bindist
           mv cataclysmdda-0.E.tar.gz cdda-${{ matrix.artifact }}-b${{ github.run_number }}.tar.gz
       - name: Build CDDA (windows)
-        if: matrix.os == 'windows'
+        if: matrix.mxe != 'none'
         env:
           PLATFORM: /usr/lib/mxe/usr/bin/${{ matrix.mxe }}-w64-mingw32.static-
         run: |
@@ -109,6 +128,17 @@ jobs:
           EOL
           make -j$((`nproc`+0)) CROSS="${PLATFORM}" TILES=1 SOUND=1 RELEASE=1 LOCALIZE=1 LANGUAGES=all BACKTRACE=0 PCH=0 bindist
           mv cataclysmdda-0.E.zip cdda-${{ matrix.artifact }}-b${{ github.run_number }}.zip
+      - name: Build CDDA (osx)
+        if: runner.os == 'macOS'
+        run: |
+          cat >VERSION.txt <<EOL
+          build type: ${{ matrix.artifact }}
+          build number: ${{ github.run_number }}
+          commit sha: ${{ github.sha }}
+          commit url: https://github.com/${{ github.repository }}/commit/${{ github.sha }}
+          EOL
+          make -j3 TILES=${{ matrix.tiles }} SOUND=${{ matrix.tiles }} RELEASE=1 LOCALIZE=1 LANGUAGES=all BACKTRACE=0 PCH=0 dmgdist
+          mv Cataclysm.dmg cdda-${{ matrix.artifact }}-b${{ github.run_number }}.dmg
       - name: Upload release asset
         id: upload-release-asset 
         uses: actions/upload-release-asset@v1

From 53ae088a725f01d7498b91da380a728c6c5671fb Mon Sep 17 00:00:00 2001
From: Zhilkin Serg <ZhilkinSerg@users.noreply.github.com>
Date: Thu, 13 May 2021 00:04:15 +0300
Subject: [PATCH 05/13] Enable concurrency for release workflow (#48848)

---
 .github/workflows/release.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index e988e0790456..4d0f0a284a87 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,4 +1,5 @@
 name: "Experimental Release"
+concurrency: release
 on:
   push:
     branches:

From 67a2a3abb6830196b14760a415d0368913b52fd8 Mon Sep 17 00:00:00 2001
From: Zhilkin Serg <ZhilkinSerg@users.noreply.github.com>
Date: Fri, 14 May 2021 19:41:24 +0300
Subject: [PATCH 06/13] Use YYYY-MM-DD-HHmm for build number; do not start
 matrix if tag exists (#48849)

---
 .github/workflows/release.yml | 47 ++++++++++++++++++++++++++---------
 1 file changed, 35 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 4d0f0a284a87..43e542bb1e38 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -10,29 +10,52 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       upload_url: ${{ steps.create_release.outputs.upload_url }}
+      timestamp: ${{ steps.get-timestamp.outputs.time }}
+      release_already_exists: ${{ steps.tag_check.outputs.exists }}
     steps:
+      - name: Get build timestamp
+        id: get-timestamp
+        uses: nanzm/get-time-action@v1.1
+        with:
+          timeZone: 0
+          format: 'YYYY-MM-DD-HHmm'
+      - name: Generate environmental variables
+        id: generate_env_vars
+        run: |
+          echo "::set-output name=tag_name::cdda-experimental-${{ steps.get-timestamp.outputs.time }}"
+          echo "::set-output name=release_name::Cataclysm-DDA experimental build ${{ steps.get-timestamp.outputs.time }}"
+      - name: Check if there is existing git tag
+        id: tag_check
+        uses: mukunku/tag-exists-action@v1.0.0
+        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/github-tag-action@v5.5
+        if: ${{ steps.tag_check.outputs.exists == 'false' }}
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
-          custom_tag: ${{ github.run_number }}
-          tag_prefix: experimental-
+          custom_tag: ${{ steps.generate_env_vars.outputs.tag_name }}
+          tag_prefix: ""
       - 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.tag_version.outputs.new_tag }}
-          release_name: "Experimental Build #${{ github.run_number }}"
+          tag_name: ${{ steps.generate_env_vars.outputs.tag_name }}
+          release_name: ${{ steps.generate_env_vars.outputs.release_name }}
           body: |
             These are the outputs for the experimental build of commit [${{ github.sha }}](https://github.com/${{ github.repository }}/commit/${{ github.sha }})
           draft: false
           prerelease: true
   builds:
     needs: release
+    if: ${{ needs.release.outputs.release_already_exists == 'false' }}
     strategy:
       matrix:
         include:
@@ -110,12 +133,12 @@ jobs:
         run: |
           cat >VERSION.txt <<EOL
           build type: ${{ matrix.artifact }}
-          build number: ${{ github.run_number }}
+          build number: ${{ needs.release.outputs.timestamp }}
           commit sha: ${{ github.sha }}
           commit url: https://github.com/${{ github.repository }}/commit/${{ github.sha }}
           EOL
           make -j$((`nproc`+0)) TILES=${{ matrix.tiles }} SOUND=${{ matrix.tiles }} RELEASE=1 LOCALIZE=1 LANGUAGES=all BACKTRACE=0 PCH=0 bindist
-          mv cataclysmdda-0.E.tar.gz cdda-${{ matrix.artifact }}-b${{ github.run_number }}.tar.gz
+          mv cataclysmdda-0.E.tar.gz cdda-${{ matrix.artifact }}-${{ needs.release.outputs.timestamp }}.tar.gz
       - name: Build CDDA (windows)
         if: matrix.mxe != 'none'
         env:
@@ -123,23 +146,23 @@ jobs:
         run: |
           cat >VERSION.txt <<EOL
           build type: ${{ matrix.artifact }}
-          build number: ${{ github.run_number }}
+          build number: ${{ needs.release.outputs.timestamp }}
           commit sha: ${{ github.sha }}
           commit url: https://github.com/${{ github.repository }}/commit/${{ github.sha }}
           EOL
           make -j$((`nproc`+0)) CROSS="${PLATFORM}" TILES=1 SOUND=1 RELEASE=1 LOCALIZE=1 LANGUAGES=all BACKTRACE=0 PCH=0 bindist
-          mv cataclysmdda-0.E.zip cdda-${{ matrix.artifact }}-b${{ github.run_number }}.zip
+          mv cataclysmdda-0.E.zip cdda-${{ matrix.artifact }}-${{ needs.release.outputs.timestamp }}.zip
       - name: Build CDDA (osx)
         if: runner.os == 'macOS'
         run: |
           cat >VERSION.txt <<EOL
           build type: ${{ matrix.artifact }}
-          build number: ${{ github.run_number }}
+          build number: ${{ needs.release.outputs.timestamp }}
           commit sha: ${{ github.sha }}
           commit url: https://github.com/${{ github.repository }}/commit/${{ github.sha }}
           EOL
           make -j3 TILES=${{ matrix.tiles }} SOUND=${{ matrix.tiles }} RELEASE=1 LOCALIZE=1 LANGUAGES=all BACKTRACE=0 PCH=0 dmgdist
-          mv Cataclysm.dmg cdda-${{ matrix.artifact }}-b${{ github.run_number }}.dmg
+          mv Cataclysm.dmg cdda-${{ matrix.artifact }}-${{ needs.release.outputs.timestamp }}.dmg
       - name: Upload release asset
         id: upload-release-asset 
         uses: actions/upload-release-asset@v1
@@ -147,6 +170,6 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ needs.release.outputs.upload_url }} 
-          asset_path: cdda-${{ matrix.artifact }}-b${{ github.run_number }}.${{ matrix.ext }}
-          asset_name: cdda-${{ matrix.artifact }}-b${{ github.run_number }}.${{ matrix.ext }}
+          asset_path: cdda-${{ matrix.artifact }}-${{ needs.release.outputs.timestamp }}.${{ matrix.ext }}
+          asset_name: cdda-${{ matrix.artifact }}-${{ needs.release.outputs.timestamp }}.${{ matrix.ext }}
           asset_content_type: ${{ matrix.content }}

From 5c647243d63c259fd5312b328fa9e2faf549c7ae Mon Sep 17 00:00:00 2001
From: Brett <Cruentus-Tigris@users.noreply.github.com>
Date: Fri, 28 May 2021 22:14:14 +1200
Subject: [PATCH 07/13] Adds Android Build to release workflow & fail-fast:
 false (#48809)

---
 .github/workflows/release.yml | 68 +++++++++++++++++++++++++++++++++--
 1 file changed, 66 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 43e542bb1e38..a2f9531dc427 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -57,6 +57,7 @@ jobs:
     needs: release
     if: ${{ needs.release.outputs.release_already_exists == 'false' }}
     strategy:
+      fail-fast: false
       matrix:
         include:
           - name: Windows Tiles x64
@@ -74,6 +75,7 @@ jobs:
           - name: Linux Tiles x64
             os: ubuntu-latest
             mxe: none
+            android: none
             tiles: 1
             artifact: linux-tiles-x64
             ext: tar.gz
@@ -81,6 +83,7 @@ jobs:
           - name: linux-curses-x64
             os: ubuntu-latest
             mxe: none
+            android: none
             tiles: 0
             artifact: linux-curses-x64
             ext: tar.gz
@@ -99,6 +102,27 @@ jobs:
             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 }}
     steps:
@@ -118,7 +142,7 @@ jobs:
           sudo apt update
           sudo apt install mxe-{i686,x86-64}-w64-mingw32.static-{sdl2,sdl2-ttf,sdl2-image,sdl2-mixer,gettext}
       - name: Install dependencies (Linux)
-        if: runner.os == 'Linux' && matrix.mxe == 'none'
+        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 \
@@ -129,7 +153,7 @@ jobs:
           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 biplist
       - name: Build CDDA (linux)
-        if: runner.os == 'Linux' && matrix.mxe == 'none'
+        if: runner.os == 'Linux' && matrix.mxe == 'none' && matrix.android == 'none' 
         run: |
           cat >VERSION.txt <<EOL
           build type: ${{ matrix.artifact }}
@@ -163,6 +187,46 @@ jobs:
           EOL
           make -j3 TILES=${{ matrix.tiles }} SOUND=${{ matrix.tiles }} RELEASE=1 LOCALIZE=1 LANGUAGES=all BACKTRACE=0 PCH=0 dmgdist
           mv Cataclysm.dmg cdda-${{ matrix.artifact }}-${{ needs.release.outputs.timestamp }}.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: |
+          cat >VERSION.txt <<EOL
+          build type: ${{ matrix.artifact }}
+          build number: ${{ needs.release.outputs.timestamp }}
+          commit sha: ${{ github.sha }}
+          commit url: https://github.com/${{ github.repository }}/commit/${{ github.sha }}
+          EOL
+          sudo apt-get update
+          sudo apt-get install gettext          
+      - name: Build CDDA (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
+          export UPSTREAM_BUILD_NUMBER="$((11581 + ${{ github.run_number }}))"
+          chmod +x gradlew
+          if [ ${{ matrix.android }} = arm64 ]
+          then
+               ./gradlew -Pj=$((`nproc`+0)) -Pabi_arm_32=false assembleExperimentalRelease
+               mv ./app/build/outputs/apk/experimental/release/*.apk ../cdda-${{ matrix.artifact }}-${{ needs.release.outputs.timestamp }}.apk
+          elif [ ${{ matrix.android }} = arm32 ]
+          then
+               ./gradlew -Pj=$((`nproc`+0)) -Pabi_arm_64=false assembleExperimentalRelease
+               mv ./app/build/outputs/apk/experimental/release/*.apk ../cdda-${{ matrix.artifact }}-${{ needs.release.outputs.timestamp }}.apk 
+          elif [ ${{ matrix.android }} = bundle ]
+          then
+               ./gradlew -Pj=$((`nproc`+0)) bundleExperimentalRelease
+               mv ./app/build/outputs/bundle/experimentalRelease/*.aab ../cdda-${{ matrix.artifact }}-${{ needs.release.outputs.timestamp }}.aab     
+          fi
       - name: Upload release asset
         id: upload-release-asset 
         uses: actions/upload-release-asset@v1

From f65651d713b69ed0bebadb0f6b8b92a1c74fe306 Mon Sep 17 00:00:00 2001
From: Binrui Dong <brett.browning.dong@gmail.com>
Date: Tue, 1 Jun 2021 08:14:31 +0800
Subject: [PATCH 08/13] Install dmgbuild 1.4.2 in OSX release GHA workflow

---
 .github/workflows/release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index a2f9531dc427..1d522aab17e0 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -151,7 +151,7 @@ jobs:
         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 biplist
+          pip3 install dmgbuild==1.4.2 biplist
       - name: Build CDDA (linux)
         if: runner.os == 'Linux' && matrix.mxe == 'none' && matrix.android == 'none' 
         run: |

From 30801df751ef6aeb3466abda6ca36ef4ca630af9 Mon Sep 17 00:00:00 2001
From: Ilya Agafonov <tairesh.rus@gmail.com>
Date: Sat, 12 Jun 2021 06:53:56 +0500
Subject: [PATCH 09/13] Build linux releases on ubuntu-18.04 (#49261)

---
 .github/workflows/release.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 1d522aab17e0..95dcad2dc42f 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -73,7 +73,7 @@ jobs:
             ext: zip
             content: application/zip
           - name: Linux Tiles x64
-            os: ubuntu-latest
+            os: ubuntu-18.04
             mxe: none
             android: none
             tiles: 1
@@ -81,7 +81,7 @@ jobs:
             ext: tar.gz
             content: application/gzip
           - name: linux-curses-x64
-            os: ubuntu-latest
+            os: ubuntu-18.04
             mxe: none
             android: none
             tiles: 0

From fdfe595802a1f8cc6f3b5efe5193c0c55d13f58d Mon Sep 17 00:00:00 2001
From: lin onetwo <linonetwo012@gmail.com>
Date: Mon, 14 Jun 2021 21:33:47 +0800
Subject: [PATCH 10/13] Provide USE_HOME_DIR=1 in MacOS build

fixes #49297
---
 .github/workflows/release.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 95dcad2dc42f..e63f634e97b8 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -178,6 +178,8 @@ jobs:
           mv cataclysmdda-0.E.zip cdda-${{ matrix.artifact }}-${{ needs.release.outputs.timestamp }}.zip
       - name: Build CDDA (osx)
         if: runner.os == 'macOS'
+        env:
+          USE_HOME_DIR: 1
         run: |
           cat >VERSION.txt <<EOL
           build type: ${{ matrix.artifact }}

From d597bef6197ca7db6287e59b42342324ffcef897 Mon Sep 17 00:00:00 2001
From: Coolthulhu <Coolthulhu@gmail.com>
Date: Sat, 19 Jun 2021 12:46:20 +0200
Subject: [PATCH 11/13] Renames

---
 .github/workflows/release.yml | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index e63f634e97b8..84b01e670d34 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -22,8 +22,8 @@ jobs:
       - name: Generate environmental variables
         id: generate_env_vars
         run: |
-          echo "::set-output name=tag_name::cdda-experimental-${{ steps.get-timestamp.outputs.time }}"
-          echo "::set-output name=release_name::Cataclysm-DDA experimental build ${{ steps.get-timestamp.outputs.time }}"
+          echo "::set-output name=tag_name::cbn-experimental-${{ steps.get-timestamp.outputs.time }}"
+          echo "::set-output name=release_name::Cataclysm-BN experimental build ${{ steps.get-timestamp.outputs.time }}"
       - name: Check if there is existing git tag
         id: tag_check
         uses: mukunku/tag-exists-action@v1.0.0
@@ -152,7 +152,7 @@ jobs:
         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: Build CDDA (linux)
+      - name: Build CBN (linux)
         if: runner.os == 'Linux' && matrix.mxe == 'none' && matrix.android == 'none' 
         run: |
           cat >VERSION.txt <<EOL
@@ -162,8 +162,8 @@ jobs:
           commit url: https://github.com/${{ github.repository }}/commit/${{ github.sha }}
           EOL
           make -j$((`nproc`+0)) TILES=${{ matrix.tiles }} SOUND=${{ matrix.tiles }} RELEASE=1 LOCALIZE=1 LANGUAGES=all BACKTRACE=0 PCH=0 bindist
-          mv cataclysmdda-0.E.tar.gz cdda-${{ matrix.artifact }}-${{ needs.release.outputs.timestamp }}.tar.gz
-      - name: Build CDDA (windows)
+          mv cataclysmbn.tar.gz cbn-${{ matrix.artifact }}-${{ needs.release.outputs.timestamp }}.tar.gz
+      - name: Build CBN (windows)
         if: matrix.mxe != 'none'
         env:
           PLATFORM: /usr/lib/mxe/usr/bin/${{ matrix.mxe }}-w64-mingw32.static-
@@ -175,8 +175,8 @@ jobs:
           commit url: https://github.com/${{ github.repository }}/commit/${{ github.sha }}
           EOL
           make -j$((`nproc`+0)) CROSS="${PLATFORM}" TILES=1 SOUND=1 RELEASE=1 LOCALIZE=1 LANGUAGES=all BACKTRACE=0 PCH=0 bindist
-          mv cataclysmdda-0.E.zip cdda-${{ matrix.artifact }}-${{ needs.release.outputs.timestamp }}.zip
-      - name: Build CDDA (osx)
+          mv cataclysmbn.zip cbn-${{ matrix.artifact }}-${{ needs.release.outputs.timestamp }}.zip
+      - name: Build CBN (osx)
         if: runner.os == 'macOS'
         env:
           USE_HOME_DIR: 1
@@ -188,7 +188,7 @@ jobs:
           commit url: https://github.com/${{ github.repository }}/commit/${{ github.sha }}
           EOL
           make -j3 TILES=${{ matrix.tiles }} SOUND=${{ matrix.tiles }} RELEASE=1 LOCALIZE=1 LANGUAGES=all BACKTRACE=0 PCH=0 dmgdist
-          mv Cataclysm.dmg cdda-${{ matrix.artifact }}-${{ needs.release.outputs.timestamp }}.dmg
+          mv CataclysmBN.dmg cbn-${{ matrix.artifact }}-${{ needs.release.outputs.timestamp }}.dmg
       - name: Set up JDK 8 (android)
         if: runner.os == 'Linux' && matrix.android != 'none' && matrix.mxe == 'none'
         uses: actions/setup-java@v2
@@ -206,7 +206,7 @@ jobs:
           EOL
           sudo apt-get update
           sudo apt-get install gettext          
-      - name: Build CDDA (android)
+      - name: Build CBN (android)
         if: runner.os == 'Linux' && matrix.android != 'none' && matrix.mxe == 'none'
         working-directory: ./android
         run: | 
@@ -219,15 +219,15 @@ jobs:
           if [ ${{ matrix.android }} = arm64 ]
           then
                ./gradlew -Pj=$((`nproc`+0)) -Pabi_arm_32=false assembleExperimentalRelease
-               mv ./app/build/outputs/apk/experimental/release/*.apk ../cdda-${{ matrix.artifact }}-${{ needs.release.outputs.timestamp }}.apk
+               mv ./app/build/outputs/apk/experimental/release/*.apk ../cbn-${{ matrix.artifact }}-${{ needs.release.outputs.timestamp }}.apk
           elif [ ${{ matrix.android }} = arm32 ]
           then
                ./gradlew -Pj=$((`nproc`+0)) -Pabi_arm_64=false assembleExperimentalRelease
-               mv ./app/build/outputs/apk/experimental/release/*.apk ../cdda-${{ matrix.artifact }}-${{ needs.release.outputs.timestamp }}.apk 
+               mv ./app/build/outputs/apk/experimental/release/*.apk ../cbn-${{ matrix.artifact }}-${{ needs.release.outputs.timestamp }}.apk 
           elif [ ${{ matrix.android }} = bundle ]
           then
                ./gradlew -Pj=$((`nproc`+0)) bundleExperimentalRelease
-               mv ./app/build/outputs/bundle/experimentalRelease/*.aab ../cdda-${{ matrix.artifact }}-${{ needs.release.outputs.timestamp }}.aab     
+               mv ./app/build/outputs/bundle/experimentalRelease/*.aab ../cbn-${{ matrix.artifact }}-${{ needs.release.outputs.timestamp }}.aab     
           fi
       - name: Upload release asset
         id: upload-release-asset 
@@ -236,6 +236,6 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ needs.release.outputs.upload_url }} 
-          asset_path: cdda-${{ matrix.artifact }}-${{ needs.release.outputs.timestamp }}.${{ matrix.ext }}
-          asset_name: cdda-${{ matrix.artifact }}-${{ needs.release.outputs.timestamp }}.${{ matrix.ext }}
+          asset_path: cbn-${{ matrix.artifact }}-${{ needs.release.outputs.timestamp }}.${{ matrix.ext }}
+          asset_name: cbn-${{ matrix.artifact }}-${{ needs.release.outputs.timestamp }}.${{ matrix.ext }}
           asset_content_type: ${{ matrix.content }}

From 9d95ab9c7d01a758680860a9e8bd20b4968f0a09 Mon Sep 17 00:00:00 2001
From: Coolthulhu <Coolthulhu@gmail.com>
Date: Sun, 20 Jun 2021 14:28:27 +0200
Subject: [PATCH 12/13] Remove deploy on Travis

---
 .github/workflows/release.yml |  4 ++--
 .travis.yml                   | 38 +++++++++--------------------------
 2 files changed, 12 insertions(+), 30 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 84b01e670d34..89b87b249759 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -3,7 +3,7 @@ concurrency: release
 on:
   push:
     branches:
-      - master
+      - upload
 jobs:
   release:
     name: Create Release
@@ -214,7 +214,7 @@ jobs:
           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
-          export UPSTREAM_BUILD_NUMBER="$((11581 + ${{ github.run_number }}))"
+          export UPSTREAM_BUILD_NUMBER="$((2037 + ${{ github.run_number }}))"
           chmod +x gradlew
           if [ ${{ matrix.android }} = arm64 ]
           then
diff --git a/.travis.yml b/.travis.yml
index f2deda23eb29..ee5aea99bdbf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -63,14 +63,14 @@ jobs:
 
     - stage: "Deployable"
     # MXE variant using alternate repository http://mirror.mxe.cc/repos/apt
-      env: COMPILER=g++ LDFLAGS="-static-libgcc -static-libstdc++" MXE_TARGET="i686-w64-mingw32.static" WINE="wine" RELEASE=1 TILES=1 SOUND=1 DEPLOY=1 OPTLEVEL="-O3" BUILD_NAME=win32-tiles
+      env: COMPILER=g++ LDFLAGS="-static-libgcc -static-libstdc++" MXE_TARGET="i686-w64-mingw32.static" WINE="wine" RELEASE=1 TILES=1 SOUND=1 OPTLEVEL="-O3"
       name: "Mingw-w64 Make cross-compile to Windows 32 bit, with -O3 optimization, with Tiles and Sound"
       compiler: gcc
       addons: &gcc
         apt:
           packages: ["wine"]
 
-    - env: COMPILER=g++-8 CXXFLAGS="-Wno-implicit-fallthrough" RELEASE=1 TILES=1 SOUND=1 DEPLOY=1 BUILD_NAME=lin32-tiles
+    - env: COMPILER=g++-8 CXXFLAGS="-Wno-implicit-fallthrough" RELEASE=1 TILES=1 SOUND=1
       name: "GCC 8 32 bit Make build with Tiles and Sound"
       dist: bionic
       compiler: gcc
@@ -79,7 +79,7 @@ jobs:
           packages: ["g++-8", "g++-8-multilib", "libc6-dbg", "libc6-dbg:i386", "libsdl2-dev", "libsdl2-ttf-dev", "libsdl2-image-dev", "libsdl2-mixer-dev"]
           sources: *apt_sources
 
-    - env: COMPILER=g++-8 CXXFLAGS="-Wno-implicit-fallthrough" RELEASE=1 DEPLOY=1 BUILD_NAME=lin32-curses
+    - env: COMPILER=g++-8 CXXFLAGS="-Wno-implicit-fallthrough" RELEASE=1
       name: "GCC 8 32 bit Make build with Curses"
       dist: bionic
       compiler: gcc
@@ -89,27 +89,27 @@ jobs:
           sources: *apt_sources
 
     # OSX
-    - env: CLANG=clang++ NATIVE=osx OSX_MIN=10.13 RELEASE=1 TILES=1 SOUND=1 BREWGETTEXT=1 DEPLOY=1 BUILD_NAME=osx32-tiles
+    - env: CLANG=clang++ NATIVE=osx OSX_MIN=10.13 RELEASE=1 TILES=1 SOUND=1 BREWGETTEXT=1
       name: "Xcode 10.1 Make build with Tiles and sound (macOS 32 bit)"
       os: osx
       osx_image: xcode10.1
       compiler: clang
 
-    - env: CLANG=clang++ NATIVE=osx OSX_MIN=10.13 RELEASE=1 BREWGETTEXT=1 DEPLOY=1 BUILD_NAME=osx32-curses
+    - env: CLANG=clang++ NATIVE=osx OSX_MIN=10.13 RELEASE=1 BREWGETTEXT=1
       name: "Xcode 10.1 Make build with Curses (macOS 32 bit)"
       os: osx
       osx_image: xcode10.1
       compiler: clang
 
     # 64 bit builds
-    - env: COMPILER=g++ LDFLAGS="-static-libgcc -static-libstdc++" MXE_TARGET="x86_64-w64-mingw32.static" WINE="wine" RELEASE=1 TILES=1 SOUND=1 DEPLOY=1 OPTLEVEL="-O3" BUILD_NAME=win64-tiles
+    - env: COMPILER=g++ LDFLAGS="-static-libgcc -static-libstdc++" MXE_TARGET="x86_64-w64-mingw32.static" WINE="wine" RELEASE=1 TILES=1 SOUND=1 OPTLEVEL="-O3"
       name: "Mingw-w64 Make cross-compile to Windows 64 bit, with -O3 optimization, with Tiles and Sound"
       compiler: gcc
       addons: &gcc
         apt:
           packages: ["wine"]
 
-    - env: COMPILER=g++-8 CXXFLAGS="-Wno-implicit-fallthrough" RELEASE=1 TILES=1 SOUND=1 DEPLOY=1 NATIVE=linux64 BUILD_NAME=lin64-tiles
+    - env: COMPILER=g++-8 CXXFLAGS="-Wno-implicit-fallthrough" RELEASE=1 TILES=1 SOUND=1 NATIVE=linux64
       name: "GCC 8 64 bit Make build with Tiles and Sound"
       dist: bionic
       compiler: gcc
@@ -118,7 +118,7 @@ jobs:
           packages: ["g++-8", "g++-8-multilib", "libc6-dbg", "libsdl2-dev", "libsdl2-ttf-dev", "libsdl2-image-dev", "libsdl2-mixer-dev"]
           sources: *apt_sources
 
-    - env: COMPILER=g++-8 CXXFLAGS="-Wno-implicit-fallthrough" RELEASE=1 DEPLOY=1 NATIVE=linux64 BUILD_NAME=lin64-curses
+    - env: COMPILER=g++-8 CXXFLAGS="-Wno-implicit-fallthrough" RELEASE=1 NATIVE=linux64
       name: "GCC 8 64 bit Make build with Curses"
       dist: bionic
       compiler: gcc
@@ -128,7 +128,7 @@ jobs:
           sources: *apt_sources
 
     # Android
-    - env: NATIVE=android BUILD_NAME=android64 DEPLOY=1
+    - env: NATIVE=android
       name: "Android ARM 64"
       language: android
       dist: trusty
@@ -138,7 +138,7 @@ jobs:
           - android-16
           - platform-tools
 
-    - env: NATIVE=android BUILD_NAME=android32 DEPLOY=1 ANDROID32=1
+    - env: NATIVE=android ANDROID32=1
       name: "Android ARM 32"
       language: android
       dist: trusty
@@ -254,21 +254,3 @@ script:
 after_success:
   - if [ -n "${CODE_COVERAGE}" ]; then coveralls -b . -i src -e tests --gcov /usr/bin/gcov-6; fi
   - if [ -n "${CODE_COVERAGE}" ]; then bash <(curl -s https://codecov.io/bash); fi
-
-before_deploy:
-  - export TRAVIS_TAG=${TRAVIS_BUILD_NUMBER}
-  - git tag --force $TRAVIS_TAG
-  - export RELEASE_PKG_FILES=$(ls cataclysm*.zip cataclysm*.tar.gz Cataclysm*.dmg)
-  - if [ $NATIVE == "android" ]; then RELEASE_PKG_FILES=$(find android -name "*.apk"); fi
-
-deploy:
-  provider: releases
-  api_key:
-    secure: YkZwEzn5TJI6fdqiYNUdWp4FaIQxvGgznW6YduSEGiiOawJOWrGqk10NGKCuOicOBI32h7ivoEIuPWc1pvABgY45WgFxI8XprBtt67sNvu//cF8GGJztevdVKbuMFa7ENRF3AuQU/OI1ll2kN5WFz+mQwfXI3Cp1kRNqUt26i8Xf7TWuXthjPob9oitlIEdq2P80Q3d6+SM8Mu2qyYF6TqUY45UMsxIFaf0HpJqgqrDZYF4iOKAoK1GihpgBYZb/VEkQWMR9yV/YOsSMDVhFXCr32tcjkxz9wY1azr6RdRK15xO/uJa8/j00a8E4rWZ/NIL3p2ZHGGXSrgDM12d1AY0nYs4Hr4VqtGv6jSemg/k9fml/7KHRa04oTv74ncUS1YYyVggQqGYd/Odekkj7yewOINUWNeZfMgsqYUgX1rlGiIxP5lkoMPwQRkFVo31k/eQ6SwrprYpi0QZWayy56LdhKZELiiuba6C5lWu5/39+hjxxsRonEwupCnuh6dGIEzhDhIEu7H2JRfqh1mxU8nOWSKac9PkOeQRBERAxiidBjIccDLVfwkxpeUSdXgrMXJ3VKNvdCOJmiA3ExHTvOCNfxMk6TfOLwjkpOOB+DqnN9G7STMjKZfO505W0QPWKHGFNbfD+g/qd4rTY7Fk+j5eDK+3WDeeEcl06vZmmij0=
-  file_glob: true
-  file: ${RELEASE_PKG_FILES}
-  skip_cleanup: true
-  on:
-    repo: cataclysmbnteam/Cataclysm-BN
-    branch: upload
-    condition: $ENABLE_DEPLOY = '1' && $DEPLOY = '1'

From 24708351d82671258f5d552ef01f22604f6cfbda Mon Sep 17 00:00:00 2001
From: Coolthulhu <Coolthulhu@gmail.com>
Date: Sun, 20 Jun 2021 18:56:29 +0200
Subject: [PATCH 13/13] Android signing (hopefully)

---
 .github/workflows/release.yml       |  28 ++++++++++++++--------------
 android/app/bn-release.keystore.enc | Bin 2608 -> 0 bytes
 android/keystore.properties.enc     | Bin 128 -> 0 bytes
 3 files changed, 14 insertions(+), 14 deletions(-)
 delete mode 100644 android/app/bn-release.keystore.enc
 delete mode 100644 android/keystore.properties.enc

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 89b87b249759..d111f98ac431 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -28,7 +28,7 @@ jobs:
         id: tag_check
         uses: mukunku/tag-exists-action@v1.0.0
         with:
-          tag: ${{ steps.generate_env_vars.outputs.tag_name }}  
+          tag: ${{ steps.generate_env_vars.outputs.tag_name }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - uses: actions/checkout@v2
@@ -115,7 +115,7 @@ jobs:
             android: arm32
             artifact: android-x32
             ext: apk
-            content: application/apk 
+            content: application/apk
           - name: Android Bundle
             os: ubuntu-latest
             mxe: none
@@ -142,7 +142,7 @@ jobs:
           sudo apt update
           sudo apt install mxe-{i686,x86-64}-w64-mingw32.static-{sdl2,sdl2-ttf,sdl2-image,sdl2-mixer,gettext}
       - name: Install dependencies (Linux)
-        if: runner.os == 'Linux' && matrix.mxe == 'none' && matrix.android == 'none' 
+        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 \
@@ -153,7 +153,7 @@ jobs:
           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: Build CBN (linux)
-        if: runner.os == 'Linux' && matrix.mxe == 'none' && matrix.android == 'none' 
+        if: runner.os == 'Linux' && matrix.mxe == 'none' && matrix.android == 'none'
         run: |
           cat >VERSION.txt <<EOL
           build type: ${{ matrix.artifact }}
@@ -194,7 +194,7 @@ jobs:
         uses: actions/setup-java@v2
         with:
           java-version: '8'
-          distribution: 'adopt'   
+          distribution: 'adopt'
       - name: Setup Build and Dependencies (android)
         if: runner.os == 'Linux' && matrix.android != 'none' && matrix.mxe == 'none'
         run: |
@@ -205,14 +205,14 @@ jobs:
           commit url: https://github.com/${{ github.repository }}/commit/${{ github.sha }}
           EOL
           sudo apt-get update
-          sudo apt-get install gettext          
+          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   
+        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
           export UPSTREAM_BUILD_NUMBER="$((2037 + ${{ github.run_number }}))"
           chmod +x gradlew
@@ -223,19 +223,19 @@ jobs:
           elif [ ${{ matrix.android }} = arm32 ]
           then
                ./gradlew -Pj=$((`nproc`+0)) -Pabi_arm_64=false assembleExperimentalRelease
-               mv ./app/build/outputs/apk/experimental/release/*.apk ../cbn-${{ matrix.artifact }}-${{ needs.release.outputs.timestamp }}.apk 
+               mv ./app/build/outputs/apk/experimental/release/*.apk ../cbn-${{ matrix.artifact }}-${{ needs.release.outputs.timestamp }}.apk
           elif [ ${{ matrix.android }} = bundle ]
           then
                ./gradlew -Pj=$((`nproc`+0)) bundleExperimentalRelease
-               mv ./app/build/outputs/bundle/experimentalRelease/*.aab ../cbn-${{ matrix.artifact }}-${{ needs.release.outputs.timestamp }}.aab     
+               mv ./app/build/outputs/bundle/experimentalRelease/*.aab ../cbn-${{ matrix.artifact }}-${{ needs.release.outputs.timestamp }}.aab
           fi
       - name: Upload release asset
-        id: 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 }} 
+          upload_url: ${{ needs.release.outputs.upload_url }}
           asset_path: cbn-${{ matrix.artifact }}-${{ needs.release.outputs.timestamp }}.${{ matrix.ext }}
           asset_name: cbn-${{ matrix.artifact }}-${{ needs.release.outputs.timestamp }}.${{ matrix.ext }}
           asset_content_type: ${{ matrix.content }}
diff --git a/android/app/bn-release.keystore.enc b/android/app/bn-release.keystore.enc
deleted file mode 100644
index 19fa2a9d890d40458460029ac61336fcb780268d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2608
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
SjV$$_r&0dW2>Gt8mgrCMBlBGV

diff --git a/android/keystore.properties.enc b/android/keystore.properties.enc
deleted file mode 100644
index 2333e680e972b522517070a35f1961f16ad73902..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 128
zcmV-`0Du3XO=RfFLPDg|kZ6dh44`w>)GHjhx#H|HK-%}yu?8*smzyfSm;Q=Q5il0w
z$VC^{!sN|UC8x(DC1csp_Qlp5JR8`uR|Yg*(^UF<IuZ+%$z{&we~V<;0iBqM&$_57
ifQU!;9FdIb`NmC%Ci3{`p3z}D8d}@{aR5%t2@ke1l|sP)