From c98b079993ac7435107f46670e7f7b7eef0682e8 Mon Sep 17 00:00:00 2001 From: Viktor Delev Date: Wed, 8 May 2024 13:47:31 +0200 Subject: [PATCH] remove "disable_cache" input --- .github/actions/build-node/action.yml | 7 +------ .github/workflows/build-node-python.yml | 11 ----------- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/.github/actions/build-node/action.yml b/.github/actions/build-node/action.yml index f4496dc9..b33ddeaa 100644 --- a/.github/actions/build-node/action.yml +++ b/.github/actions/build-node/action.yml @@ -29,10 +29,6 @@ inputs: run_webpack: default: false required: false - disable_cache: - description: "Set to true to disable caching" - default: false - required: false runs: using: "composite" @@ -67,7 +63,6 @@ runs: name: node-yarn-lock # Enable yarn download cache, @see https://github.com/actions/cache/tree/main/save#always-save-cache and https://github.com/actions/setup-node/issues/325 - name: Restore yarn cache - if: inputs.disable_cache == 'false' uses: actions/cache/restore@v3 with: # This path is the global yarn cache, because for some reason the local .yarn/cache is not used. Maybe we need to set the cacheFolder, enableGlobalCache, ... options differently? @see https://yarnpkg.com/configuration/yarnrc#cacheFolder @@ -80,7 +75,7 @@ runs: run: yarn install --no-immutable --inline-builds shell: bash - name: Save yarn cache - if: inputs.disable_cache == 'false' && steps.install.outcome == 'success' + if: steps.install.outcome == 'success' uses: actions/cache/save@v3 with: # This path is the global yarn cache, because for some reason the local .yarn/cache is not used. Maybe we need to set the cacheFolder, enableGlobalCache, ... options differently? @see https://yarnpkg.com/configuration/yarnrc#cacheFolder diff --git a/.github/workflows/build-node-python.yml b/.github/workflows/build-node-python.yml index 17b02cf9..1151dd34 100644 --- a/.github/workflows/build-node-python.yml +++ b/.github/workflows/build-node-python.yml @@ -71,11 +71,6 @@ on: required: false description: Unique id per workflow run. Must be set to unique value if dispatched multiple times for a single workflow. default: "" - #disable_cache: - # description: "Set to true to disable caching" - # required: false - # type: boolean - # default: false chromatic_enable: description: 'Enable Chromatic Tests' required: false @@ -141,7 +136,6 @@ jobs: npm_registry: ${{ env.NPM_REGISTRY }} github_ro_token: ${{ github.event.repository.private == true && secrets.DATAVISYN_BOT_REPO_TOKEN || github.token }} run_webpack: ${{ inputs.node_run_webpack }} - #disable_cache: ${{ inputs.disable_cache }} - name: Run Chromatic if: ${{ inputs.chromatic_enable }} uses: chromaui/action@v11.3.0 @@ -172,7 +166,6 @@ jobs: with: python_version: ${{ secrets.PYTHON_VERSION || env.PYTHON_VERSION }} github_ro_token: ${{ github.event.repository.private == true && secrets.DATAVISYN_BOT_REPO_TOKEN || github.token }} - #disable_cache: ${{ inputs.disable_cache }} # If cypress is used, build node and python sequentially as it is avoiding the duplicate install overhead build-node-python-cypress: name: Node, Python, Cypress @@ -236,13 +229,11 @@ jobs: npm_registry: ${{ env.NPM_REGISTRY }} github_ro_token: ${{ github.event.repository.private == true && secrets.DATAVISYN_BOT_REPO_TOKEN || github.token }} run_webpack: false # Disable the build here and call afterwards, as otherwise the yarn run env:decrypt will fail due to a missing yarn install - #disable_cache: ${{ inputs.disable_cache }} - name: Build python uses: ./tmp/github-workflows/.github/actions/build-python with: python_version: ${{ secrets.PYTHON_VERSION || env.PYTHON_VERSION }} github_ro_token: ${{ github.event.repository.private == true && secrets.DATAVISYN_BOT_REPO_TOKEN || github.token }} - disable_cache: true - name: Decrypt .env.enc and /.env.enc run: | yarn run env:decrypt -pass env:ENV_PASSWORD || true @@ -358,13 +349,11 @@ jobs: npm_registry: ${{ env.NPM_REGISTRY }} github_ro_token: ${{ github.event.repository.private == true && secrets.DATAVISYN_BOT_REPO_TOKEN || github.token }} run_webpack: false # Disable the build here and call afterwards, as otherwise the yarn run env:decrypt will fail due to a missing yarn install - #disable_cache: ${{ inputs.disable_cache }} - name: Build python uses: ./tmp/github-workflows/.github/actions/build-python with: python_version: ${{ secrets.PYTHON_VERSION || env.PYTHON_VERSION }} github_ro_token: ${{ github.event.repository.private == true && secrets.DATAVISYN_BOT_REPO_TOKEN || github.token }} - #disable_cache: ${{ inputs.disable_cache }} - name: Decrypt .env.enc and /.env.enc run: | yarn run env:decrypt -pass env:ENV_PASSWORD || true