remove westerveltco/setup-ci-action from test.yml (#252)

westerveltco · Aug 2, 2024 · 6f1e095 · 6f1e095
1 parent 1115242
commit 6f1e095
Show file tree

Hide file tree

Showing 2 changed files with 74 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -21,6 +21,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 - Created a new GitHub Team for documentation and added it to the `CODEOWNERS` file in the project template.
 
+### Removed
+
+- Removed `westerveltco/setup-ci-action@simplify` action within `test.yml` GitHub Actions workflow in favor of explicitly running actions directly.
+
 ## [2024.36]
 
 ### Changed

diff --git a/src/django_twc_project/.github/workflows/test.yml.jinja b/src/django_twc_project/.github/workflows/test.yml.jinja
@@ -39,13 +39,44 @@ jobs:
       EMAIL_RELAY_DATABASE_URL: {{ postgres_uri_scheme }}://postgres:postgres@localhost:5432/email-relay
     steps:
       - uses: actions/checkout@v4
+
+      - uses: actions/setup-python@v5
+        with:
+          python-version: {% raw %}${{ env.PYTHON_VERSION }}{% endraw %}
+
+      - name: Install uv
+        run: |
+          python -m pip install -U pip uv
+
+      - name: Get cache dir
+        id: uv-cache
+        run: |
+          echo "dir=$(uv cache dir)" >> $GITHUB_OUTPUT
+
+      - uses: actions/cache@v4
+        id: cache-uv
         with:
-          persist-credentials: false
+          path: {% raw %}${{ steps.py-cache.outputs.dir }}{% endraw %}
+          key: {% raw %}${{ runner.os }}-uv-${{ hashFiles('**/requirements.txt') }}{% endraw %}
+          restore-keys: |
+            {% raw %}${{ runner.os }}-uv-{% endraw %}
 
-      - uses: westerveltco/setup-ci-action@simplify
+      - uses: actions/setup-node@v4
         with:
           node-version: {% raw %}${{ env.NODE_VERSION }}{% endraw %}
-          python-version: {% raw %}${{ env.PYTHON_VERSION }}{% endraw %}
+
+      - name: Get npm cache directory
+        id: npm-cache-dir
+        run: |
+          echo "dir=$(npm config get cache)" >> ${GITHUB_OUTPUT}
+
+      - uses: actions/cache@v4
+        id: cache-npm
+        with:
+          path: {% raw %}${{ steps.npm-cache-dir.outputs.dir }}{% endraw %}
+          key: {% raw %}${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}{% endraw %}
+          restore-keys: |
+            {% raw %}${{ runner.os }}-node-{% endraw %}
 
       - name: Install dependencies
         run: |
@@ -108,17 +139,31 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-        with:
-          persist-credentials: false
 
-      - uses: westerveltco/setup-ci-action@simplify
+      - uses: actions/setup-python@v5
         with:
           python-version: {% raw %}${{ env.PYTHON_VERSION }}{% endraw %}
 
+      - name: Install uv
+        run: |
+          python -m pip install -U pip uv
+
+      - name: Get cache dir
+        id: uv-cache
+        run: |
+          echo "dir=$(uv cache dir)" >> $GITHUB_OUTPUT
+
+      - uses: actions/cache@v4
+        id: cache-uv
+        with:
+          path: {% raw %}${{ steps.py-cache.outputs.dir }}{% endraw %}
+          key: {% raw %}${{ runner.os }}-uv-${{ hashFiles('**/requirements.txt') }}{% endraw %}
+          restore-keys: |
+            {% raw %}${{ runner.os }}-uv-{% endraw %}
+
       - name: Install dependencies
         run: |
           python -m uv pip install --system -r requirements.txt -r requirements.dev.txt
-          npm install
 
       - name: Install system packages
         env:
@@ -151,17 +196,31 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-        with:
-          persist-credentials: false
 
-      - uses: westerveltco/setup-ci-action@simplify
+      - uses: actions/setup-python@v5
         with:
           python-version: {% raw %}${{ env.PYTHON_VERSION }}{% endraw %}
 
+      - name: Install uv
+        run: |
+          python -m pip install -U pip uv
+
+      - name: Get cache dir
+        id: uv-cache
+        run: |
+          echo "dir=$(uv cache dir)" >> $GITHUB_OUTPUT
+
+      - uses: actions/cache@v4
+        id: cache-uv
+        with:
+          path: {% raw %}${{ steps.py-cache.outputs.dir }}{% endraw %}
+          key: {% raw %}${{ runner.os }}-uv-${{ hashFiles('**/requirements.txt') }}{% endraw %}
+          restore-keys: |
+            {% raw %}${{ runner.os }}-uv-{% endraw %}
+
       - name: Install dependencies
         run: |
           python -m uv pip install --system -r requirements.txt -r requirements.dev.txt
-          npm install
 
       - name: Install dependencies
         env: