Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci: adjusts for oauth2 #2058

Merged
merged 1 commit into from
Dec 21, 2024
Merged

ci: adjusts for oauth2 #2058

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .blueprint/generate-sample/templates/ios.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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' }),
Expand Down
5 changes: 5 additions & 0 deletions .blueprint/github-build-matrix/__snapshots__/generator.spec.mjs.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=",
Expand All @@ -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=",
Expand All @@ -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=",
Expand All @@ -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=",
Expand All @@ -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=",
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/ios.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading