Integration into current CI files

.github/actions/build-macos/action.yml

@@ -23,6 +23,8 @@ inputs:
     required: true
   APPLE_KEY_CONTENT:
     required: true
+  BUNDLE_ID:
+    required: true
 runs:
   using: "composite"
   steps:
@@ -30,10 +32,8 @@ runs:
     - name: Checkout template
       uses: actions/checkout@v2
       with:
-        # TODO change ref
         repository: '26F-Studio/Techmino-macOS'
         path: 'Techmino-macOS'
-        ref: 'dmg'
     - name: Download ColdClear
       uses: ./.github/actions/get-cc
       with:
@@ -81,12 +81,11 @@ runs:
         lane: 'make_safe'
         subdirectory: 'Techmino-macOS'
       env:
-        # TODO: Bundle ID
         APPLE_KEY_ID: '${{ inputs.APPLE_KEY_ID }}'
         APPLE_ISSUER_ID: '${{ inputs.APPLE_ISSUER_ID }}'
         APPLE_KEY_CONTENT: '${{ inputs.APPLE_KEY_CONTENT }}'
         NOTARIZE_OBJECT: 'Techmino.app'
-        BUNDLE_ID: 'org.26f-studio.Techmino.dev'
+        BUNDLE_ID: '${{ inputs.BUNDLE_ID }}'
     - name: Create DMG file
       shell: bash
       run: |
@@ -121,12 +120,11 @@ runs:
         lane: 'make_safe'
         subdirectory: 'Techmino-macOS'
       env:
-        # TODO: Bundle ID
         APPLE_KEY_ID: '${{ inputs.APPLE_KEY_ID }}'
         APPLE_ISSUER_ID: '${{ inputs.APPLE_ISSUER_ID }}'
         APPLE_KEY_CONTENT: '${{ inputs.APPLE_KEY_CONTENT }}'
         NOTARIZE_OBJECT: 'Techmino-macOS.dmg'
-        BUNDLE_ID: 'org.26f-studio.Techmino.dev'
+        BUNDLE_ID: '${{ inputs.BUNDLE_ID }}'
     - name: Finalize
       shell: bash
       run: |

.github/workflows/dev.yml

@@ -99,10 +99,10 @@ jobs:
         commit: ${{ needs.get-info.outputs.commit }}
     - uses: ./.github/actions/build-macos
       with:
-        name: '${{ needs.get-info.outputs.name }}'
+        name: ${{ needs.get-info.outputs.name }}
-        type: 'dev'
+        type: 'snapshot'
         icon: .github/build/macOS/icon_snapshot.icns
-        DEVELOPER_APP_IDENTIFIER: '${{ secrets.APP_IDENTIFIER_DEV }}'
+        DEVELOPER_APP_IDENTIFIER: '${{ secrets.APP_IDENTIFIER_RELEASE }}'
         MATCH_PASSWORD: '${{ secrets.MATCH_PASSWORD }}'
         GIT_AUTHORIZATION: '${{ secrets.GIT_AUTHORIZATION }}'
         TEMP_KEYCHAIN_PASSWORD: '${{ secrets.TEMP_KEYCHAIN_PASSWORD }}'
@@ -110,14 +110,12 @@ jobs:
         APPLE_KEY_ID: '${{ secrets.APPLE_KEY_ID }}'
         APPLE_ISSUER_ID: '${{ secrets.APPLE_ISSUER_ID }}'
         APPLE_KEY_CONTENT: '${{ secrets.APPLE_KEY_CONTENT }}'
-    - name: Pack Techmino
+        BUNDLE_ID: 'org.26f-studio.Techmino.dev'
-      run: |
-        zip -r -y Techmino.zip Techmino.app
     - name: Upload
       uses: actions/upload-artifact@v2
       with:
         name: Techmino_${{ needs.get-info.outputs.name }}_${{ GITHUB.RUN_NUMBER }}_${{ needs.get-info.outputs.commit }}_macOS
-        path: Techmino.zip
+        path: Techmino.dmg
 
   build-iOS:
     runs-on: macos-latest

.github/workflows/release.yml

@@ -167,10 +167,10 @@ jobs:
         APPLE_KEY_ID: '${{ secrets.APPLE_KEY_ID }}'
         APPLE_ISSUER_ID: '${{ secrets.APPLE_ISSUER_ID }}'
         APPLE_KEY_CONTENT: '${{ secrets.APPLE_KEY_CONTENT }}'
+        BUNDLE_ID: 'org.26f-studio.Techmino'
     - name: Pack Techmino
       run: |
-        cp ".github/build/macOS/打不开？Can’t open the App？.pdf" ./
+        mv Techmino.dmg Techmino.a${{ needs.get-info.outputs.release }}.macOS.dmg
-        zip -r -y Techmino.a${{ needs.get-info.outputs.release }}.macOS.zip Techmino.app "./打不开？Can’t open the App？.pdf"
     - name: Release
       uses: softprops/action-gh-release@v1
       with:

.github/workflows/test.yml

@@ -1,148 +0,0 @@
-name: Techmino Test CI
-
-on:
-  push:
-    branches: [ pre*, ci* ]
-  pull_request:
-    branches: [ pre*, ci* ]
-
-jobs:
-  get-info:
-    runs-on: ubuntu-20.04
-    outputs:
-      name: ${{ steps.actual-get-info.outputs.name }}
-      apkCode: ${{ steps.actual-get-info.outputs.apkCode }}
-      code: ${{ steps.actual-get-info.outputs.code }}
-      commit: ${{ steps.actual-get-info.outputs.commit }}
-    steps:
-    - uses: actions/checkout@v2
-    - name: Install lua
-      run: |
-        sudo apt-get install lua5.3 -y
-    - name: Get Version
-      id: actual-get-info
-      run: |
-        echo "::set-output name=name::$(lua .github/workflows/getVersion.lua -name)"
-        echo "::set-output name=apkCode::$(lua .github/workflows/getVersion.lua -apkCode)"
-        echo "::set-output name=code::$(lua .github/workflows/getVersion.lua -code)"
-        echo "::set-output name=commit::$(git rev-parse --short ${{ GITHUB.SHA }})"
-
-  # build-windows:
-  #   runs-on: windows-latest
-  #   needs: get-info
-  #   steps:
-  #   - uses: actions/checkout@v2
-  #   - uses: ./.github/actions/snapshot-update
-  #     with:
-  #       commit: ${{ needs.get-info.outputs.commit }}
-  #   - uses: ./.github/actions/build-windows
-  #     with:
-  #       love-url: https://github.com/love2d/love/releases/download/11.3/love-11.3-win64.zip
-  #       love-dir: love-11.3-win64
-  #       arch: win64
-  #       version: ${{ needs.get-info.outputs.name }}
-  #       icon: .\.github\build\Windows\icon_snapshot.ico
-  #   - name: Upload
-  #     uses: actions/upload-artifact@v2
-  #     with:
-  #       name: Techmino_${{ needs.get-info.outputs.name }}_${{ GITHUB.RUN_NUMBER }}_${{ needs.get-info.outputs.commit }}_Windows
-  #       path: love
-
-  # build-linux:
-  #   runs-on: ubuntu-20.04
-  #   needs: get-info
-  #   steps:
-  #   - uses: actions/checkout@v2
-  #   - uses: ./.github/actions/snapshot-update
-  #     with:
-  #       commit: ${{ needs.get-info.outputs.commit }}
-  #   - uses: ./.github/actions/build-linux
-  #     with:
-  #       icon: .github/build/Linux/icon_snapshot.png
-  #   - name: Upload
-  #     uses: actions/upload-artifact@v2
-  #     with:
-  #       name: Techmino_${{ needs.get-info.outputs.name }}_${{ GITHUB.RUN_NUMBER }}_${{ needs.get-info.outputs.commit }}_Linux
-  #       path: Techmino.AppImage
-
-  # build-android:
-  #   runs-on: ubuntu-20.04
-  #   needs: get-info
-  #   steps:
-  #   - uses: actions/checkout@v2
-  #   - uses: ./.github/actions/snapshot-update
-  #     with:
-  #       commit: ${{ needs.get-info.outputs.commit }}
-  #   - uses: ./.github/actions/build-android
-  #     with:
-  #       type: Snapshot
-  #       apkCode: ${{ needs.get-info.outputs.apkCode }}
-  #       name: ${{ needs.get-info.outputs.name }}
-  #       file-path: Techmino_Snapshot.apk
-  #       SIGNING_KEY: ${{ secrets.SIGNING_KEY }}
-  #       KEY_STORE_PASSWORD: ${{ secrets.KEY_STORE_PASSWORD }}
-  #       ALIAS: ${{ secrets.ALIAS }}
-  #       KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
-  #   - name: Upload
-  #     uses: actions/upload-artifact@v2
-  #     with:
-  #       name: Techmino_${{ needs.get-info.outputs.name }}_${{ GITHUB.RUN_NUMBER }}_${{ needs.get-info.outputs.commit }}_Android
-  #       path: Techmino_Snapshot.apk
-
-  build-macOS:
-    runs-on: macos-10.15
-    needs: get-info
-    steps:
-    - uses: actions/checkout@v2
-    - uses: ./.github/actions/snapshot-update
-      with:
-        commit: ${{ needs.get-info.outputs.commit }}
-    - uses: ./.github/actions/build-macos
-      with:
-        name: '${{ needs.get-info.outputs.name }}'
-        type: 'dev'
-        icon: .github/build/macOS/icon_snapshot.icns
-        DEVELOPER_APP_IDENTIFIER: '${{ secrets.APP_IDENTIFIER_DEV }}'
-        MATCH_PASSWORD: '${{ secrets.MATCH_PASSWORD }}'
-        GIT_AUTHORIZATION: '${{ secrets.GIT_AUTHORIZATION }}'
-        TEMP_KEYCHAIN_PASSWORD: '${{ secrets.TEMP_KEYCHAIN_PASSWORD }}'
-        TEMP_KEYCHAIN_USER: '${{ secrets.TEMP_KEYCHAIN_USER }}'
-        APPLE_KEY_ID: '${{ secrets.APPLE_KEY_ID }}'
-        APPLE_ISSUER_ID: '${{ secrets.APPLE_ISSUER_ID }}'
-        APPLE_KEY_CONTENT: '${{ secrets.APPLE_KEY_CONTENT }}'
-    - name: Upload
-      uses: actions/upload-artifact@v2
-      with:
-        name: Techmino_${{ needs.get-info.outputs.name }}_${{ GITHUB.RUN_NUMBER }}_${{ needs.get-info.outputs.commit }}_macOS
-        path: Techmino.dmg
-
-  # build-iOS:
-  #   runs-on: macos-latest
-  #   needs: get-info
-  #   steps:
-  #   - uses: actions/checkout@v2
-  #   - uses: ./.github/actions/snapshot-update
-  #     with:
-  #       commit: ${{ needs.get-info.outputs.commit }}
-  #   - uses: ./.github/actions/build-ios
-  #     with:
-  #       name: ${{ needs.get-info.outputs.name }}
-  #       type: 'test'
-  #       DEVELOPER_APP_ID: '${{ secrets.APP_ID_DEV }}'
-  #       DEVELOPER_APP_IDENTIFIER: '${{ secrets.APP_IDENTIFIER_DEV }}'
-  #       FASTLANE_APPLE_ID: '${{ secrets.FASTLANE_APPLE_ID }}'
-  #       MATCH_PASSWORD: '${{ secrets.MATCH_PASSWORD }}'
-  #       GIT_AUTHORIZATION: '${{ secrets.GIT_AUTHORIZATION }}'
-  #       PROVISIONING_PROFILE_SPECIFIER: '${{ secrets.PROVISIONING_PROFILE_SPECIFIER_DEV }}'
-  #       TEMP_KEYCHAIN_PASSWORD: '${{ secrets.TEMP_KEYCHAIN_PASSWORD }}'
-  #       TEMP_KEYCHAIN_USER: '${{ secrets.TEMP_KEYCHAIN_USER }}'
-  #       APPLE_KEY_ID: '${{ secrets.APPLE_KEY_ID }}'
-  #       APPLE_ISSUER_ID: '${{ secrets.APPLE_ISSUER_ID }}'
-  #       APPLE_KEY_CONTENT: '${{ secrets.APPLE_KEY_CONTENT }}'
-  #       PROJECT_BUILD_NUMBER: '${{ needs.get-info.outputs.code }}.${{ github.run_number }}'
-  #       PILOT_CHANGE_LOG: '${{ github.event.commits[0].message }}'
-  #   - name: Upload
-  #     uses: actions/upload-artifact@v2
-  #     with:
-  #       name: Techmino_${{ needs.get-info.outputs.name }}_${{ GITHUB.RUN_NUMBER }}_${{ needs.get-info.outputs.commit }}_iOS
-  #       path: "Techmino.ipa"