ci: adjusts for oauth2 (#2058)

jhipster · Dec 21, 2024 · 6eb9b11 · 6eb9b11
1 parent 3c94324
commit 6eb9b11
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/.blueprint/generate-sample/templates/ios.js b/.blueprint/generate-sample/templates/ios.js
@@ -8,6 +8,7 @@ export default Object.fromEntries(
     sample,
     {
       ...spec,
+      'docker-services': !sample.includes('oauth2'),
       ...(sample.includes('oauth2')
         ? { os: 'macos-13', 'default-environment': 'prod', 'skip-e2e': 'true' }
         : { os: 'macos-15', 'default-environment': 'dev' }),

diff --git a/.blueprint/github-build-matrix/__snapshots__/generator.spec.mjs.snap b/.blueprint/github-build-matrix/__snapshots__/generator.spec.mjs.snap
@@ -5,6 +5,7 @@ exports[`generator - github-build-matrix > with ios > should match matrix value
   "include": [
     {
       "default-environment": "dev",
+      "docker-services": true,
       "java-version": "17",
       "job-name": "21points-jwt",
       "jwt-secret-key": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=",
@@ -17,6 +18,7 @@ exports[`generator - github-build-matrix > with ios > should match matrix value
     },
     {
       "default-environment": "dev",
+      "docker-services": true,
       "java-version": "17",
       "job-name": "app-jwt",
       "jwt-secret-key": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=",
@@ -29,6 +31,7 @@ exports[`generator - github-build-matrix > with ios > should match matrix value
     },
     {
       "default-environment": "prod",
+      "docker-services": false,
       "java-version": "17",
       "job-name": "app-oauth2",
       "jwt-secret-key": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=",
@@ -42,6 +45,7 @@ exports[`generator - github-build-matrix > with ios > should match matrix value
     },
     {
       "default-environment": "dev",
+      "docker-services": true,
       "java-version": "17",
       "job-name": "app-websocket",
       "jwt-secret-key": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=",
@@ -54,6 +58,7 @@ exports[`generator - github-build-matrix > with ios > should match matrix value
     },
     {
       "default-environment": "dev",
+      "docker-services": true,
       "java-version": "17",
       "job-name": "flickr2-jwt",
       "jwt-secret-key": "ZjY4MTM4YjI5YzMwZjhjYjI2OTNkNTRjMWQ5Y2Q0Y2YwOWNmZTE2NzRmYzU3NTMwM2NjOTE3MTllOTM3MWRkMzcyYTljMjVmNmQ0Y2MxOTUzODc0MDhhMTlkMDIxMzI2YzQzZDM2ZDE3MmQ3NjVkODk3OTVmYzljYTQyZDNmMTQ=",

diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml
@@ -112,11 +112,11 @@ jobs:
           timeout_minutes: 60
           command: brew tap wix/brew && brew install applesimutils && applesimutils --list
           retry_wait_seconds: 15
-      - uses: douglascamata/setup-docker-macos-action@8d5fa43892aed7eee4effcdea113fd53e4d4bf83
-        if: matrix.default-environment == 'prod' && steps.compare.outputs.equals != 'true'
-        timeout-minutes: 10
+      #- uses: douglascamata/setup-docker-macos-action@8d5fa43892aed7eee4effcdea113fd53e4d4bf83
+      #  if: matrix.default-environment == 'prod' && steps.compare.outputs.equals != 'true'
+      #  timeout-minutes: 10
       - run: npm run services:up
-        if: matrix.default-environment == 'prod' && steps.compare.outputs.equals != 'true'
+        if: matrix.default-environment == 'prod' && steps.compare.outputs.equals != 'true' && matrix.docker-services != 'no'
         working-directory: ${{ github.workspace }}/backend
 
       - run: npm install