refactor: extract deno and python setup

open-innovations · Jan 22, 2025 · c718b61 · c718b61
1 parent 8b5d9d3
commit c718b61
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 49 deletions.
diff --git a/.github/actions/setup-deno-environment/action.yml b/.github/actions/setup-deno-environment/action.yml
@@ -0,0 +1,15 @@
+name: Setup deno environment
+runs:
+  using: composite
+  steps:
+    - name: Setup deno
+      uses: denoland/setup-deno@v2
+      with:
+        deno-version: v2.x
+
+    - name: Cache Deno dependencies
+      id: cache-deno
+      uses: actions/cache@v4
+      with:
+        key: deno-cache-${{ hashFiles('./deno.lock') }}
+        path: ${{ env.DENO_DIR }}
diff --git a/.github/actions/setup-python-environment/action.yml b/.github/actions/setup-python-environment/action.yml
@@ -0,0 +1,15 @@
+name: Setup python environment
+runs:
+  using: composite
+  steps:
+    - name: Setup python
+      uses: actions/setup-python@v5
+      with:
+        python-version: "3.12"
+        cache: pipenv
+
+    - name: Setup pipenv
+      run: |
+        pip install pipenv
+        pipenv install
+
diff --git a/.github/workflows/build-site.yml b/.github/workflows/build-site.yml
@@ -37,27 +37,10 @@ jobs:
           fetch-depth: 0
 
       - name: Setup python
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.12"
-          cache: pipenv
-
-      - name: Setup pipenv
-        run: |
-          pip install pipenv
-          pipenv install
+        uses: ./.github/actions/setup-python-environment
 
       - name: Setup deno
-        uses: denoland/setup-deno@v2
-        with:
-          deno-version: v2.x
-
-      - name: Cache Deno dependencies
-        id: cache-deno
-        uses: actions/cache@v4
-        with:
-          key: deno-cache-${{ hashFiles('./deno.lock') }}
-          path: ${{ env.DENO_DIR }}
+        uses: ./.github/actions/setup-deno-environment
 
       - name: Get current data
         run: |

diff --git a/.github/workflows/deploy-dev.yml b/.github/workflows/deploy-dev.yml
@@ -44,27 +44,10 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Setup python
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.12"
-          cache: pipenv
-
-      - name: Setup pipenv
-        run: |
-          pip install pipenv
-          pipenv install
+        uses: ./.github/actions/setup-python-environment
 
       - name: Setup deno
-        uses: denoland/setup-deno@v2
-        with:
-          deno-version: v2.x
-
-      - name: Cache Deno dependencies
-        id: cache-deno
-        uses: actions/cache@v4
-        with:
-          key: deno-cache-${{ hashFiles('./deno.lock') }}
-          path: ${{ env.DENO_DIR }}
+        uses: ./.github/actions/setup-deno-environment
 
       - name: Get current data
         run: |
@@ -73,12 +56,12 @@ jobs:
 
           echo "${{ secrets.DEPLOY_KEY }}" > deploy-key
           ssh-add deploy-key
-          pipenv run dvc update data/published.dvc data/metadata.dvc
+          pipenv run dvc pull data/published.dvc data/metadata.dvc
           ssh-add -D
 
           echo "${{ secrets.DEPLOY_KEY_HUQ }}" > deploy-key-huq
           ssh-add deploy-key-huq          
-          pipenv run dvc update data/huq.dvc
+          pipenv run dvc pull data/huq.dvc
           ssh-add -D
 
       - name: Run pipelines

diff --git a/.github/workflows/update-data.yml b/.github/workflows/update-data.yml
@@ -35,15 +35,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Setup python
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.12"
-          cache: pipenv
-
-      - name: Setup pipenv
-        run: |
-          pip install pipenv
-          pipenv install
+        uses: ./.github/actions/setup-python-environment
 
       - name: Update data
         run: |