From 22658cedb75092c3bcabaad7b1fd63d7257dee73 Mon Sep 17 00:00:00 2001 From: Ben Larabie Date: Wed, 12 Feb 2025 08:09:03 -0500 Subject: [PATCH] fix cache clearing (#2082) * fix cache clearing * adjusting pathing * updating rest of the cache * debug * debug * debug * debug * debug * debug * debug * debug * debug * debug * formatting * debug * updating prod --------- Co-authored-by: Ben Larabie --- .github/workflows/test.yaml | 21 +++++++++++-------- .github/workflows/test_endpoints.yaml | 6 +++--- .github/workflows/test_prod_config.yaml | 21 +++++++++++-------- .../tailwind/components/preview-pane.css | 3 ++- .../elements/form-multiple-choice.css | 3 ++- 5 files changed, 31 insertions(+), 23 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 9d1450bdd3..7122f1d5de 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -9,35 +9,38 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + - uses: actions/setup-python@b64ffcaf5b410884ad320a9cfac8866006a109aa # v4.8.0 with: python-version: '3.12' - - uses: actions/setup-node@1a4442cacd436585916779262731d5b162bc6ec7 # v3.8.2 + + - uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0 with: node-version: '16.x' - - uses: actions/cache@e12d46a63a90f2fae62d114769bbf2a179198b5c # v3.3.3 + cache: 'npm' + + - uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0 with: path: ~/.cache/pip - key: ${{ runner.os }}-pip-${{ hashFiles('requirements.txt') }} + key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }} restore-keys: | ${{ runner.os }}-pip- + - name: Install poetry env: POETRY_VERSION: "1.7.1" run: pip install poetry==${POETRY_VERSION} poetry-plugin-sort && poetry --version + - name: Install requirements run: poetry install --with test - - uses: actions/cache@e12d46a63a90f2fae62d114769bbf2a179198b5c # v3.3.3 - with: - path: ~/.npm - key: ${{ runner.os }}-node-${{ hashFiles('package-lock.json') }} - restore-keys: | - ${{ runner.os }}-node- + - name: Check for missing translations run: make test-translations + - run: /bin/bash -c "scripts/bootstrap.sh && poetry run make test" env: A11Y_TRACKER_KEY: ${{ secrets.A11Y_TRACKER_KEY }} + - name: Notify Slack channel if this job failed in default branch if: ${{ failure() && github.ref == 'refs/heads/main' }} run: | diff --git a/.github/workflows/test_endpoints.yaml b/.github/workflows/test_endpoints.yaml index b1ffcac03b..0c5eecacfd 100644 --- a/.github/workflows/test_endpoints.yaml +++ b/.github/workflows/test_endpoints.yaml @@ -16,13 +16,13 @@ jobs: - name: Upgrade pip run: python -m pip install --upgrade pip - - uses: actions/cache@e12d46a63a90f2fae62d114769bbf2a179198b5c # v3.3.3 + - uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0 with: path: ~/.cache/pip - key: ${{ runner.os }}-pip-${{ hashFiles('requirements.txt') }} + key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }} restore-keys: | ${{ runner.os }}-pip- - + - name: Install poetry env: POETRY_VERSION: "1.7.1" diff --git a/.github/workflows/test_prod_config.yaml b/.github/workflows/test_prod_config.yaml index d166353705..92ca516713 100644 --- a/.github/workflows/test_prod_config.yaml +++ b/.github/workflows/test_prod_config.yaml @@ -9,38 +9,41 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + - uses: actions/setup-python@b64ffcaf5b410884ad320a9cfac8866006a109aa # v4.8.0 with: python-version: '3.12' - - uses: actions/setup-node@1a4442cacd436585916779262731d5b162bc6ec7 # v3.8.2 + + - uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0 with: node-version: '16.x' - - uses: actions/cache@e12d46a63a90f2fae62d114769bbf2a179198b5c # v3.3.3 + cache: 'npm' + + - uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0 with: path: ~/.cache/pip - key: ${{ runner.os }}-pip-${{ hashFiles('requirements.txt') }} + key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }} restore-keys: | ${{ runner.os }}-pip- + - name: Install poetry env: POETRY_VERSION: "1.7.1" run: pip install poetry==${POETRY_VERSION} && poetry --version + - name: Install requirements run: poetry install --with test - - uses: actions/cache@e12d46a63a90f2fae62d114769bbf2a179198b5c # v3.3.3 - with: - path: ~/.npm - key: ${{ runner.os }}-node-${{ hashFiles('package-lock.json') }} - restore-keys: | - ${{ runner.os }}-node- - name: Check for missing translations run: make test-translations + - name: Update NOTIFY_ENVIRONMENT for pytest run: sed -i 's/NOTIFY_ENVIRONMENT=test/NOTIFY_ENVIRONMENT=production_FF/' pytest.ini + - run: /bin/bash -c "scripts/bootstrap.sh && poetry run make test" env: A11Y_TRACKER_KEY: ${{ secrets.A11Y_TRACKER_KEY }} + - name: Notify Slack channel if this job failed in default branch if: ${{ failure() && github.ref == 'refs/heads/main' }} run: | diff --git a/app/assets/stylesheets/tailwind/components/preview-pane.css b/app/assets/stylesheets/tailwind/components/preview-pane.css index 92d2ceb744..0a4987b494 100644 --- a/app/assets/stylesheets/tailwind/components/preview-pane.css +++ b/app/assets/stylesheets/tailwind/components/preview-pane.css @@ -6,7 +6,8 @@ } #logo-img { - background-image: linear-gradient(45deg, $grey-3 25%, transparent 25%), + background-image: + linear-gradient(45deg, $grey-3 25%, transparent 25%), linear-gradient(-45deg, $grey-3 25%, transparent 25%), linear-gradient(45deg, transparent 75%, $grey-3 75%), linear-gradient(-45deg, transparent 75%, $grey-3 75%); diff --git a/app/assets/stylesheets/tailwind/elements/form-multiple-choice.css b/app/assets/stylesheets/tailwind/elements/form-multiple-choice.css index 7f484d9b0b..c7629964f6 100644 --- a/app/assets/stylesheets/tailwind/elements/form-multiple-choice.css +++ b/app/assets/stylesheets/tailwind/elements/form-multiple-choice.css @@ -159,7 +159,8 @@ background-position: 0 0, 5px 5px; - background-image: linear-gradient( + background-image: + linear-gradient( 45deg, #cfd5dd 25%, transparent 25%,