diff --git a/.github/workflows/deploy-crisiscleanup-site.yml b/.github/workflows/deploy-crisiscleanup-site.yml index 0b448cbb..bcf7be5e 100644 --- a/.github/workflows/deploy-crisiscleanup-site.yml +++ b/.github/workflows/deploy-crisiscleanup-site.yml @@ -98,13 +98,13 @@ jobs: with: ref: master repository: CrisisCleanup/crisiscleanup-4-web - path: ${{runner.temp}}/.crisiscleanup-4-web + path: .crisiscleanup-4-web - name: Install Web - working-directory: ${{runner.temp}}/.crisiscleanup-4-web - run: pnpm install + working-directory: .crisiscleanup-4-web + run: pnpm --ignore-workspace install - name: Build Web - working-directory: ${{runner.temp}}/.crisiscleanup-4-web - run: pnpm build:app + working-directory: .crisiscleanup-4-web + run: pnpm --ignore-workspace build:app - name: Install run: pnpm install - name: Build @@ -113,7 +113,7 @@ jobs: pnpm -F 'stacks.web' run synth:silent cp -r packages/stacks/web/cdk.out ./cdk.out env: - CCU_WEB_SITE_SOURCE: ${{runner.temp}}/.crisiscleanup-4-web/dist + CCU_WEB_SITE_SOURCE: .crisiscleanup-4-web/dist - name: Push cdk.context.json continue-on-error: true env: diff --git a/packages/stacks/web/src/main.ts b/packages/stacks/web/src/main.ts index 7253b6cf..6a4ad8f8 100644 --- a/packages/stacks/web/src/main.ts +++ b/packages/stacks/web/src/main.ts @@ -51,8 +51,7 @@ class CrisisCleanupWebStage extends GitHubStage { } } -const webRoot = - interpolateValue(ActionsContext.RUNNER, 'temp') + '/.crisiscleanup-4-web' +const webRoot = '.crisiscleanup-4-web' const webDist = webRoot + '/dist' const pipeline = GithubCodePipeline.create({ rootDir: cwd!, @@ -94,12 +93,12 @@ const pipeline = GithubCodePipeline.create({ .synthPreStep({ name: 'Build Web', workingDirectory: webRoot, - run: 'pnpm build:app', + run: 'pnpm --ignore-workspace build:app', }) .synthPreStep({ name: 'Install Web', workingDirectory: webRoot, - run: 'pnpm install', + run: 'pnpm --ignore-workspace install', }) .synthCheckout({ ref: 'master',