Update build config

finol-digital · Jul 6, 2020 · 533bd42 · 533bd42
1 parent 1a78e47
commit 533bd42
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 215 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -3,14 +3,14 @@ on:
   push: { branches: [develop, master] }
   pull_request: { branches: [master] }
   release: { types: [published] }
-env:
-    UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
-    UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
-    UNITY_SERIAL: ${{ secrets.UNITY_SERIAL }}
 jobs:
   buildForAllPlatforms:
     name: Build for ${{ matrix.targetPlatform }} on version ${{ matrix.unityVersion }}
     runs-on: ubuntu-latest
+    env:
+      UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
+      UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
+      UNITY_SERIAL: ${{ secrets.UNITY_SERIAL }}
     strategy:
       fail-fast: false
       matrix:
@@ -33,24 +33,17 @@ jobs:
         with:
           path: Library
           key: Library-${{ matrix.targetPlatform }}
-      - name: free disk space
-        run: |
-          sudo swapoff -a
-          sudo rm -f /swapfile
-          sudo apt clean
-          docker rmi $(docker image ls -aq)
-          df -h
-      - name: create android keystore
-        run: |
-          echo "${{ secrets.UNITY_ANDROID_KEYSTORE }}" > finoldigital.keystore.asc
-          gpg -d --passphrase "${{ secrets.UNITY_ANDROID_KEYSTORE_PASS }}" --batch finoldigital.keystore.asc > finoldigital.keystore
-      - uses: webbertakken/unity-builder@bf702784d2650ed3933a93d0592b1927acc057a7
+      - uses: davidmfinol/unity-builder@4bbcbe6395a50f6afe3576a4371126cd998055c5
         with:
           unityVersion: ${{ matrix.unityVersion }}
           targetPlatform: ${{ matrix.targetPlatform }}
           buildsPath: builds
-          buildMethod: Cgs.Editor.BuildCgs.BuildProject
-          customParameters: -androidAppBundle -keystorePass ${{ secrets.UNITY_ANDROID_KEYSTORE_PASS }} -keyaliasPass ${{ secrets.UNITY_ANDROID_KEYSTORE_PASS }}
+          androidAppBundle: true
+          androidKeystoreName: finoldigital.keystore
+          androidKeystoreBase64: ${{ secrets.ANDROID_KEYSTORE_BASE64 }}
+          androidKeystorePass: ${{ secrets.ANDROID_KEYSTORE_PASS }}
+          androidKeyaliasName: ${{ secrets.ANDROID_KEYALIAS_NAME }}
+          androidKeyaliasPass: ${{ secrets.ANDROID_KEYALIAS_PASS }}
       - uses: actions/upload-artifact@v1
         if: github.event.ref != 'refs/heads/develop'
         with:
@@ -91,19 +84,19 @@ jobs:
         with:
           name: cgs-builds
           path: builds
-      - run: |
+      - name: Prepare for upload
+        run: |
           echo "$GOOGLE_PLAY_KEY_FILE" > $GOOGLE_PLAY_KEY_FILE_PATH
           echo "$RELEASE_NOTES" > fastlane/metadata/android/en-US/changelogs/default.txt
+          find $BUILDS_PATH -type f -iname "*.sh" -exec chmod +x {} \;
+          chmod +x fastlane/sign-osx-build.sh
+          ./fastlane/sign-osx-build.sh
       - uses: maierj/[email protected]
         with:
           lane: 'android playstore'
-      - run: find $BUILDS_PATH -type f -iname "*.sh" -exec chmod +x {} \;
       - uses: maierj/[email protected]
         with:
           lane: 'ios release'
-      - run: |
-          chmod +x fastlane/sign-osx-build.sh
-          ./fastlane/sign-osx-build.sh
       - uses: maierj/[email protected]
         with:
           lane: 'mac macupload'
diff --git a/Assets/Scripts/CardGameDef/CardGame.cs b/Assets/Scripts/CardGameDef/CardGame.cs
@@ -181,7 +181,7 @@ public class CardGame
 
         [JsonProperty]
         [Description(
-            "If cardNameIsUnique is true, different Cards are not allowed to have the same *Card:Name*. Cards with the same name will be treated as reprints, with the option to hide reprints available. If cardNameIsUnique false, DeckFileType.Txt will require <deckFileTxtId> for every Card.")]
+            "If cardNameIsUnique is true, different Cards are not allowed to have the same *Card:Name*. Cards with the same name will be treated as reprints, with the option to hide reprints available. If cardNameIsUnique is false, DeckFileType.Txt will require <deckFileTxtId> for every Card.")]
         [DefaultValue(true)]
         public bool CardNameIsUnique { get; set; } = true;
 

diff --git a/Assets/Scripts/Cgs/Editor/BuildCgs.cs b/Assets/Scripts/Cgs/Editor/BuildCgs.cs
diff --git a/Assets/Scripts/Cgs/Editor/BuildCgs.cs.meta b/Assets/Scripts/Cgs/Editor/BuildCgs.cs.meta
diff --git a/docs/pages/roadmap.md b/docs/pages/roadmap.md
@@ -8,6 +8,7 @@ permalink: roadmap.html
 - Enhance backend
 
 ## Current Sprint
+- Filter '@' when creating game in-app
 - Fix: Card moved to server, but is still in hand
 - Play Mode Redesign
   - gamePlayDeckName (default="Stock", "Square Wall" for Mahjong)

diff --git a/docs/schema/CardGameDef.json b/docs/schema/CardGameDef.json
@@ -135,7 +135,7 @@
     },
     "cardNameIsUnique": {
       "type": "boolean",
-      "description": "If cardNameIsUnique is true, different Cards are not allowed to have the same *Card:Name*. Cards with the same name will be treated as reprints, with the option to hide reprints available. If cardNameIsUnique false, DeckFileType.Txt will require <deckFileTxtId> for every Card.",
+      "description": "If cardNameIsUnique is true, different Cards are not allowed to have the same *Card:Name*. Cards with the same name will be treated as reprints, with the option to hide reprints available. If cardNameIsUnique is false, DeckFileType.Txt will require <deckFileTxtId> for every Card.",
       "default": true
     },
     "cardPrimaryProperty": {