diff --git a/.github/actions/build-ios/action.yml b/.github/actions/build-ios/action.yml index 6647aa19..fa1ddced 100644 --- a/.github/actions/build-ios/action.yml +++ b/.github/actions/build-ios/action.yml @@ -40,6 +40,9 @@ inputs: FASTLANE_DISCORD_WEBHOOK: required: true description: "Fastlane Discord webhook" + FASTLANE_ACTION_ID: + required: true + description: "Fastlane Action ID" FASTLANE_MATCH_PWD: required: true description: "Fastlane Match description password" @@ -71,6 +74,7 @@ runs: lane: '${{ inputs.type }}' subdirectory: 'Techmino-iOS/platform/xcode' env: + ACTION_ID: '${{ inputs.FASTLANE_ACTION_ID }}' API_ID: '${{ inputs.APPLE_API_ID }}' API_ISSUER: '${{ inputs.APPLE_API_ISSUER }}' API_KEY: '${{ inputs.APPLE_API_KEY }}' diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index 93162c8e..3002055b 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -27,93 +27,93 @@ jobs: 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-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-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-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 }} - icon: .github/build/macOS/icon_snapshot.icns - APPLE_API_ID: '${{ secrets.APPLE_API_ID }}' - APPLE_API_ISSUER: '${{ secrets.APPLE_API_ISSUER }}' - APPLE_API_KEY: '${{ secrets.APPLE_API_KEY }}' - APPLE_APP_IDENTIFIER: '${{ secrets.APPLE_APP_IDENTIFIER }}' - APPLE_KEYCHAIN_NAME: '${{ secrets.APPLE_KEYCHAIN_NAME }}' - APPLE_KEYCHAIN_PWD: '${{ secrets.APPLE_KEYCHAIN_PWD }}' - FASTLANE_MATCH_PWD: '${{ secrets.FASTLANE_MATCH_PWD }}' - FASTLANE_MATCH_TOKEN: '${{ secrets.FASTLANE_MATCH_TOKEN }}' - - 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-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 }} + # icon: .github/build/macOS/icon_snapshot.icns + # APPLE_API_ID: '${{ secrets.APPLE_API_ID }}' + # APPLE_API_ISSUER: '${{ secrets.APPLE_API_ISSUER }}' + # APPLE_API_KEY: '${{ secrets.APPLE_API_KEY }}' + # APPLE_APP_IDENTIFIER: '${{ secrets.APPLE_APP_IDENTIFIER }}' + # APPLE_KEYCHAIN_NAME: '${{ secrets.APPLE_KEYCHAIN_NAME }}' + # APPLE_KEYCHAIN_PWD: '${{ secrets.APPLE_KEYCHAIN_PWD }}' + # FASTLANE_MATCH_PWD: '${{ secrets.FASTLANE_MATCH_PWD }}' + # FASTLANE_MATCH_TOKEN: '${{ secrets.FASTLANE_MATCH_TOKEN }}' + # - 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 @@ -137,6 +137,7 @@ jobs: APPLE_APP_PROFILE: '${{ secrets.APPLE_APP_PROFILE }}' APPLE_KEYCHAIN_NAME: '${{ secrets.APPLE_KEYCHAIN_NAME }}' APPLE_KEYCHAIN_PWD: '${{ secrets.APPLE_KEYCHAIN_PWD }}' + FASTLANE_ACTION_ID: '${{ github.run_id }}' FASTLANE_DISCORD_WEBHOOK: '${{ secrets.FASTLANE_DISCORD_WEBHOOK }}' FASTLANE_MATCH_PWD: '${{ secrets.FASTLANE_MATCH_PWD }}' FASTLANE_MATCH_TOKEN: '${{ secrets.FASTLANE_MATCH_TOKEN }}' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 337c947d..97fb1b15 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -196,6 +196,7 @@ jobs: APPLE_APP_PROFILE: '${{ secrets.APPLE_APP_PROFILE }}' APPLE_KEYCHAIN_NAME: '${{ secrets.APPLE_KEYCHAIN_NAME }}' APPLE_KEYCHAIN_PWD: '${{ secrets.APPLE_KEYCHAIN_PWD }}' + FASTLANE_ACTION_ID: '${{ github.run_id }}' FASTLANE_DISCORD_WEBHOOK: '${{ secrets.FASTLANE_DISCORD_WEBHOOK }}' FASTLANE_MATCH_PWD: '${{ secrets.FASTLANE_MATCH_PWD }}' FASTLANE_MATCH_TOKEN: '${{ secrets.FASTLANE_MATCH_TOKEN }}' diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index de19961e..206c8005 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -138,6 +138,7 @@ jobs: APPLE_APP_PROFILE: '${{ secrets.APPLE_APP_PROFILE }}' APPLE_KEYCHAIN_NAME: '${{ secrets.APPLE_KEYCHAIN_NAME }}' APPLE_KEYCHAIN_PWD: '${{ secrets.APPLE_KEYCHAIN_PWD }}' + FASTLANE_ACTION_ID: '${{ github.run_id }}' FASTLANE_DISCORD_WEBHOOK: '${{ secrets.FASTLANE_DISCORD_WEBHOOK }}' FASTLANE_MATCH_PWD: '${{ secrets.FASTLANE_MATCH_PWD }}' FASTLANE_MATCH_TOKEN: '${{ secrets.FASTLANE_MATCH_TOKEN }}'