Skip to content

Commit 0bc2f15

Browse files
authored
Merge dev into main (#88)
* feat(ci): add branch argument for deploying "APP" to Cloudflare Pages (#85) * feat(ci): remove dev code/add pre dev code (#87)
1 parent a7ab402 commit 0bc2f15

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

.github/file-filters.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,21 @@ packages_apps: &packages_apps
22
- 'packages/app-base/**'
33
- 'packages/eslint-config/**'
44
- 'packages/typescript-config/**'
5-
- './**'
65

76
app_blog: &app_blog
87
- *packages_apps
98
- 'apps/blog/**'
10-
- './**'
119

1210
app_web: &app_web
1311
- *packages_apps
1412
- 'apps/web/**'
15-
- './**'
1613

1714
app_all: &app_all
1815
- *app_blog
1916
- *app_web
2017

2118
service_api: &service_api
2219
- 'services/api/**'
23-
- './**'
2420

2521
service_all: &service_all
2622
- *service_api

.github/workflows/ci-cd.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -298,6 +298,7 @@ jobs:
298298
name: build
299299

300300
- name: Test
301+
if: needs.files-changed.outputs.turbo_filter_args
301302
run: pnpm test ${{ needs.files-changed.outputs.turbo_filter_args }}
302303
env:
303304
DB_CONNECTION: sqlite
@@ -565,7 +566,7 @@ jobs:
565566
accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
566567
apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
567568
workingDirectory: "apps/blog/"
568-
command: pages deploy dist/ --project-name ${{ secrets.CLOUDFLARE_PAGES_PROJECT_NAME_APP_BLOG }}
569+
command: pages deploy dist/ --project-name ${{ secrets.CLOUDFLARE_PAGES_PROJECT_NAME_APP_BLOG }}{{ github.event_name == 'release' && !github.event.release.prerelease && ' --branch=production' || '' }}
569570
packageManager: pnpm
570571

571572
cloudflare-pages-deploy-app-web:
@@ -606,5 +607,5 @@ jobs:
606607
accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
607608
apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
608609
workingDirectory: "apps/web/"
609-
command: pages deploy dist/ --project-name ${{ secrets.CLOUDFLARE_PAGES_PROJECT_NAME_APP_WEB }}
610+
command: pages deploy dist/ --project-name ${{ secrets.CLOUDFLARE_PAGES_PROJECT_NAME_APP_WEB }}{{ github.event_name == 'release' && !github.event.release.prerelease && ' --branch=production' || '' }}
610611
packageManager: pnpm

0 commit comments

Comments
 (0)