diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6af026a..c047933 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,21 +11,10 @@ jobs: steps: - uses: actions/checkout@master - - uses: actions/setup-node@v2.1.5 + - uses: actions/setup-node@v2.5.1 with: node-version: '16' - - - name: Get yarn cache directory path - id: yarn-cache-dir-path - run: echo "::set-output name=dir::$(yarn cache dir)" - - - uses: actions/cache@v2.1.6 - id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`) - with: - path: ${{ steps.yarn-cache-dir-path.outputs.dir }} - key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }} - restore-keys: | - ${{ runner.os }}-yarn- + cache: yarn - run: yarn install --frozen-lockfile @@ -45,9 +34,10 @@ jobs: steps: - uses: actions/checkout@master - - uses: actions/setup-node@v2.1.5 + - uses: actions/setup-node@v2.5.1 with: node-version: '16' + cache: yarn - id: 'auth' uses: 'google-github-actions/auth@v0' @@ -67,20 +57,6 @@ jobs: && echo ::set-output name=skip::1 \ || echo ::set-output name=skip::0 - - name: Get yarn cache directory path - if: steps.check.outputs.skip == '0' - id: yarn-cache-dir-path - run: echo "::set-output name=dir::$(yarn cache dir)" - - - uses: actions/cache@v2.1.6 - if: steps.check.outputs.skip == '0' - id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`) - with: - path: ${{ steps.yarn-cache-dir-path.outputs.dir }} - key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }} - restore-keys: | - ${{ runner.os }}-yarn- - - run: yarn install --frozen-lockfile if: steps.check.outputs.skip == '0' diff --git a/terraform/api.tf b/terraform/api.tf index e6edc0d..d12a78c 100644 --- a/terraform/api.tf +++ b/terraform/api.tf @@ -12,7 +12,7 @@ resource "cloudflare_workers_kv_namespace" "guild_data" { resource "cloudflare_worker_script" "backend" { name = "roleypoly-backend-${var.environment_tag}" - content = file("${path.module}/${var.api_path_to_worker}") + content = file("${path.module}/${var.path_to_worker}") kv_namespace_binding { name = "KV_SESSIONS"