diff --git a/.github/workflows/build-debug.yml b/.github/workflows/build-debug.yml index b126de4..a1ba417 100644 --- a/.github/workflows/build-debug.yml +++ b/.github/workflows/build-debug.yml @@ -19,22 +19,33 @@ jobs: - run: dotnet test tests/ZString.Tests -c Debug build-unity: - if: "((github.event_name == 'push' && github.repository_owner == 'Cysharp') || startsWith(github.event.pull_request.head.label, 'Cysharp:'))" + if: ${{ (github.event_name == 'push' && github.repository_owner == 'Cysharp') || startsWith(github.event.pull_request.head.label, 'Cysharp:') }} strategy: matrix: unity: ["2021.3.11f1"] runs-on: ubuntu-latest timeout-minutes: 15 steps: + - name: Load secrets + id: op-load-secret + uses: 1password/load-secrets-action@v2 + with: + export-env: false + env: + OP_SERVICE_ACCOUNT_TOKEN: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN_PUBLIC }} + UNITY_EMAIL: "op://GitHubActionsPublic/UNITY_LICENSE/username" + UNITY_PASSWORD: "op://GitHubActionsPublic/UNITY_LICENSE/credential" + UNITY_SERIAL: "op://GitHubActionsPublic/UNITY_LICENSE/serial" + - uses: actions/checkout@v3 # Execute scripts: Export Package # /opt/Unity/Editor/Unity -quit -batchmode -nographics -silent-crashes -logFile -projectPath . -executeMethod PackageExporter.Export - name: Build Unity (.unitypacakge) uses: Cysharp/Actions/.github/actions/unity-builder@main env: - UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }} - UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }} - UNITY_SERIAL: ${{ secrets.UNITY_SERIAL }} + UNITY_EMAIL: ${{ steps.op-load-secret.outputs.UNITY_EMAIL }} + UNITY_PASSWORD: ${{ steps.op-load-secret.outputs.UNITY_PASSWORD }} + UNITY_SERIAL: ${{ steps.op-load-secret.outputs.UNITY_SERIAL }} with: projectPath: src/ZString.Unity unityVersion: ${{ matrix.unity }} diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index f88f0d2..6e77e9b 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -48,6 +48,17 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 15 steps: + - name: Load secrets + id: op-load-secret + uses: 1password/load-secrets-action@v2 + with: + export-env: false + env: + OP_SERVICE_ACCOUNT_TOKEN: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN_PUBLIC }} + UNITY_EMAIL: "op://GitHubActionsPublic/UNITY_LICENSE/username" + UNITY_PASSWORD: "op://GitHubActionsPublic/UNITY_LICENSE/credential" + UNITY_SERIAL: "op://GitHubActionsPublic/UNITY_LICENSE/serial" + - uses: actions/checkout@v3 with: ref: ${{ needs.update-packagejson.outputs.sha }} @@ -56,9 +67,9 @@ jobs: - name: Build Unity (.unitypacakge) uses: Cysharp/Actions/.github/actions/unity-builder@main env: - UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }} - UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }} - UNITY_SERIAL: ${{ secrets.UNITY_SERIAL }} + UNITY_EMAIL: ${{ steps.op-load-secret.outputs.UNITY_EMAIL }} + UNITY_PASSWORD: ${{ steps.op-load-secret.outputs.UNITY_PASSWORD }} + UNITY_SERIAL: ${{ steps.op-load-secret.outputs.UNITY_SERIAL }} UNITY_PACKAGE_VERSION: ${{ inputs.tag }} with: projectPath: src/ZString.Unity