Run batches concurrently

duckduckgo · Nov 22, 2024 · 940ab54 · 940ab54
1 parent d2ae549
commit 940ab54
Showing 1 changed file with 44 additions and 47 deletions.
diff --git a/.github/workflows/create_variants.yml b/.github/workflows/create_variants.yml
@@ -70,60 +70,57 @@ jobs:
           path: ${{ github.workspace }}/duckduckgo.dmg
           retention-days: 1
 
-  # create-variants-1:
-
-  #   name: Create Variant
-  #   needs: [set-up-variants, download-dmg-and-upload-artifact]
-
-  #   strategy:
-  #     fail-fast: false
-  #     matrix: ${{ fromJSON(needs.set-up-variants.outputs.build-variants-1) }}
-  #   uses: ./.github/workflows/create_variant.yml
-  #   with:
-  #     atb-variant: ${{ matrix.variant }}
-  #     origin-variant: ${{ matrix.origin }}
-  #   secrets:
-  #     APPLE_API_KEY_BASE64: ${{ secrets.APPLE_API_KEY_BASE64 }}
-  #     APPLE_API_KEY_ID: ${{ secrets.APPLE_API_KEY_ID }}
-  #     APPLE_API_KEY_ISSUER: ${{ secrets.APPLE_API_KEY_ISSUER }}
-  #     AWS_ACCESS_KEY_ID_RELEASE_S3: ${{ secrets.AWS_ACCESS_KEY_ID_RELEASE_S3 }}
-  #     AWS_SECRET_ACCESS_KEY_RELEASE_S3: ${{ secrets.AWS_SECRET_ACCESS_KEY_RELEASE_S3 }}
-  #     MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
-  #     SSH_PRIVATE_KEY_FASTLANE_MATCH: ${{ secrets.SSH_PRIVATE_KEY_FASTLANE_MATCH }}
-
-  # create-variants-2:
-
-  #   name: Create Variant
-  #   needs: [set-up-variants, download-dmg-and-upload-artifact, create-variants-1]
-
-  #   strategy:
-  #     fail-fast: false
-  #     matrix: ${{ fromJSON(needs.set-up-variants.outputs.build-variants-2) }}
-  #   uses: ./.github/workflows/create_variant.yml
-  #   with:
-  #     atb-variant: ${{ matrix.variant }}
-  #     origin-variant: ${{ matrix.origin }}
-  #   secrets:
-  #     APPLE_API_KEY_BASE64: ${{ secrets.APPLE_API_KEY_BASE64 }}
-  #     APPLE_API_KEY_ID: ${{ secrets.APPLE_API_KEY_ID }}
-  #     APPLE_API_KEY_ISSUER: ${{ secrets.APPLE_API_KEY_ISSUER }}
-  #     AWS_ACCESS_KEY_ID_RELEASE_S3: ${{ secrets.AWS_ACCESS_KEY_ID_RELEASE_S3 }}
-  #     AWS_SECRET_ACCESS_KEY_RELEASE_S3: ${{ secrets.AWS_SECRET_ACCESS_KEY_RELEASE_S3 }}
-  #     MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
-  #     SSH_PRIVATE_KEY_FASTLANE_MATCH: ${{ secrets.SSH_PRIVATE_KEY_FASTLANE_MATCH }}
+  create-variants-1:
+
+    name: Create Variant
+    needs: [set-up-variants, download-dmg-and-upload-artifact]
+
+    strategy:
+      fail-fast: false
+      matrix: ${{ fromJSON(needs.set-up-variants.outputs.build-variants-1) }}
+    uses: ./.github/workflows/create_variant.yml
+    with:
+      atb-variant: ${{ matrix.variant }}
+      origin-variant: ${{ matrix.origin }}
+    secrets:
+      APPLE_API_KEY_BASE64: ${{ secrets.APPLE_API_KEY_BASE64 }}
+      APPLE_API_KEY_ID: ${{ secrets.APPLE_API_KEY_ID }}
+      APPLE_API_KEY_ISSUER: ${{ secrets.APPLE_API_KEY_ISSUER }}
+      AWS_ACCESS_KEY_ID_RELEASE_S3: ${{ secrets.AWS_ACCESS_KEY_ID_RELEASE_S3 }}
+      AWS_SECRET_ACCESS_KEY_RELEASE_S3: ${{ secrets.AWS_SECRET_ACCESS_KEY_RELEASE_S3 }}
+      MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
+      SSH_PRIVATE_KEY_FASTLANE_MATCH: ${{ secrets.SSH_PRIVATE_KEY_FASTLANE_MATCH }}
+
+  create-variants-2:
+
+    name: Create Variant
+    needs: [set-up-variants, download-dmg-and-upload-artifact]
+
+    strategy:
+      fail-fast: false
+      matrix: ${{ fromJSON(needs.set-up-variants.outputs.build-variants-2) }}
+    uses: ./.github/workflows/create_variant.yml
+    with:
+      atb-variant: ${{ matrix.variant }}
+      origin-variant: ${{ matrix.origin }}
+    secrets:
+      APPLE_API_KEY_BASE64: ${{ secrets.APPLE_API_KEY_BASE64 }}
+      APPLE_API_KEY_ID: ${{ secrets.APPLE_API_KEY_ID }}
+      APPLE_API_KEY_ISSUER: ${{ secrets.APPLE_API_KEY_ISSUER }}
+      AWS_ACCESS_KEY_ID_RELEASE_S3: ${{ secrets.AWS_ACCESS_KEY_ID_RELEASE_S3 }}
+      AWS_SECRET_ACCESS_KEY_RELEASE_S3: ${{ secrets.AWS_SECRET_ACCESS_KEY_RELEASE_S3 }}
+      MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
+      SSH_PRIVATE_KEY_FASTLANE_MATCH: ${{ secrets.SSH_PRIVATE_KEY_FASTLANE_MATCH }}
 
   mattermost:
 
     name: Send Mattermost message
-    needs: download-dmg-and-upload-artifact
-    # needs: [create-variants-2]
+    needs: [create-variants-1, create-variants-2]
     runs-on: macos-15
 
     env:
-      success: ${{ needs.download-dmg-and-upload-artifact.result == 'success' }}
-      failure: ${{ needs.download-dmg-and-upload-artifact.result == 'failure' }}
-      # success: ${{ needs.create-variants-2.result == 'success' }}
-      # failure: ${{ needs.create-variants-2.result == 'failure' }}
+      success: ${{ needs.create-variants-1.result == 'success' && needs.create-variants-2.result == 'success' }}
+      failure: ${{ needs.create-variants-1.result == 'failure' || needs.create-variants-2.result == 'failure' }}
 
     steps:
       - name: Check out the code