Fix: Releases

NDLANO · Jan 17, 2025 · eb15547 · eb15547
1 parent 517e6a0
commit eb15547
Show file tree

Hide file tree

Showing 11 changed files with 55 additions and 22 deletions.
diff --git a/.github/workflows/article-api_release.yml b/.github/workflows/article-api_release.yml
@@ -60,14 +60,17 @@ jobs:
           path: ndla/deploy
       - uses: actions/setup-python@v4
         with:
-          python-version: '3.11'
+          python-version: ${{ vars.PYTHON_VERSION }}
       - uses: abatilo/actions-poetry@v2
         with:
-          poetry-version: "1.6.1"
+          poetry-version: ${{ vars.POETRY_VERSION }}
       - uses: actions/setup-java@v3
         with:
           distribution: temurin
           java-version: '20'
+      - uses: hashicorp/setup-terraform@v3
+        with:
+          terraform_version: ${{ vars.TERRAFORM_VERSION }}
       - name: Setup ~/bin directory
         run: |
           mkdir -p /home/runner/bin

diff --git a/.github/workflows/audio-api_release.yml b/.github/workflows/audio-api_release.yml
@@ -58,14 +58,17 @@ jobs:
           path: ndla/deploy
       - uses: actions/setup-python@v4
         with:
-          python-version: '3.11'
+          python-version: ${{ vars.PYTHON_VERSION }}
       - uses: abatilo/actions-poetry@v2
         with:
-          poetry-version: "1.6.1"
+          poetry-version: ${{ vars.POETRY_VERSION }}
       - uses: actions/setup-java@v3
         with:
           distribution: temurin
           java-version: '20'
+      - uses: hashicorp/setup-terraform@v3
+        with:
+          terraform_version: ${{ vars.TERRAFORM_VERSION }}
       - name: Setup ~/bin directory
         run: |
           mkdir -p /home/runner/bin

diff --git a/.github/workflows/concept-api_release.yml b/.github/workflows/concept-api_release.yml
@@ -60,14 +60,17 @@ jobs:
           path: ndla/deploy
       - uses: actions/setup-python@v4
         with:
-          python-version: '3.11'
+          python-version: ${{ vars.PYTHON_VERSION }}
       - uses: abatilo/actions-poetry@v2
         with:
-          poetry-version: "1.6.1"
+          poetry-version: ${{ vars.POETRY_VERSION }}
       - uses: actions/setup-java@v3
         with:
           distribution: temurin
           java-version: '20'
+      - uses: hashicorp/setup-terraform@v3
+        with:
+          terraform_version: ${{ vars.TERRAFORM_VERSION }}
       - name: Setup ~/bin directory
         run: |
           mkdir -p /home/runner/bin

diff --git a/.github/workflows/draft-api_release.yml b/.github/workflows/draft-api_release.yml
@@ -60,14 +60,17 @@ jobs:
           path: ndla/deploy
       - uses: actions/setup-python@v4
         with:
-          python-version: '3.11'
+          python-version: ${{ vars.PYTHON_VERSION }}
       - uses: abatilo/actions-poetry@v2
         with:
-          poetry-version: "1.6.1"
+          poetry-version: ${{ vars.POETRY_VERSION }}
       - uses: actions/setup-java@v3
         with:
           distribution: temurin
           java-version: '20'
+      - uses: hashicorp/setup-terraform@v3
+        with:
+          terraform_version: ${{ vars.TERRAFORM_VERSION }}
       - name: Setup ~/bin directory
         run: |
           mkdir -p /home/runner/bin

diff --git a/.github/workflows/frontpage-api_release.yml b/.github/workflows/frontpage-api_release.yml
@@ -56,14 +56,17 @@ jobs:
           path: ndla/deploy
       - uses: actions/setup-python@v4
         with:
-          python-version: '3.11'
+          python-version: ${{ vars.PYTHON_VERSION }}
       - uses: abatilo/actions-poetry@v2
         with:
-          poetry-version: "1.6.1"
+          poetry-version: ${{ vars.POETRY_VERSION }}
       - uses: actions/setup-java@v3
         with:
           distribution: temurin
           java-version: '20'
+      - uses: hashicorp/setup-terraform@v3
+        with:
+          terraform_version: ${{ vars.TERRAFORM_VERSION }}
       - name: Setup ~/bin directory
         run: |
           mkdir -p /home/runner/bin

diff --git a/.github/workflows/image-api_release.yml b/.github/workflows/image-api_release.yml
@@ -58,14 +58,17 @@ jobs:
           path: ndla/deploy
       - uses: actions/setup-python@v4
         with:
-          python-version: '3.11'
+          python-version: ${{ vars.PYTHON_VERSION }}
       - uses: abatilo/actions-poetry@v2
         with:
-          poetry-version: "1.6.1"
+          poetry-version: ${{ vars.POETRY_VERSION }}
       - uses: actions/setup-java@v3
         with:
           distribution: temurin
           java-version: '20'
+      - uses: hashicorp/setup-terraform@v3
+        with:
+          terraform_version: ${{ vars.TERRAFORM_VERSION }}
       - name: Setup ~/bin directory
         run: |
           mkdir -p /home/runner/bin

diff --git a/.github/workflows/learningpath-api_release.yml b/.github/workflows/learningpath-api_release.yml
@@ -58,14 +58,17 @@ jobs:
           path: ndla/deploy
       - uses: actions/setup-python@v4
         with:
-          python-version: '3.11'
+          python-version: ${{ vars.PYTHON_VERSION }}
       - uses: abatilo/actions-poetry@v2
         with:
-          poetry-version: "1.6.1"
+          poetry-version: ${{ vars.POETRY_VERSION }}
       - uses: actions/setup-java@v3
         with:
           distribution: temurin
           java-version: '20'
+      - uses: hashicorp/setup-terraform@v3
+        with:
+          terraform_version: ${{ vars.TERRAFORM_VERSION }}
       - name: Setup ~/bin directory
         run: |
           mkdir -p /home/runner/bin

diff --git a/.github/workflows/myndla-api_release.yml b/.github/workflows/myndla-api_release.yml
@@ -56,14 +56,17 @@ jobs:
           path: ndla/deploy
       - uses: actions/setup-python@v4
         with:
-          python-version: '3.11'
+          python-version: ${{ vars.PYTHON_VERSION }}
       - uses: abatilo/actions-poetry@v2
         with:
-          poetry-version: "1.6.1"
+          poetry-version: ${{ vars.POETRY_VERSION }}
       - uses: actions/setup-java@v3
         with:
           distribution: temurin
           java-version: '20'
+      - uses: hashicorp/setup-terraform@v3
+        with:
+          terraform_version: ${{ vars.TERRAFORM_VERSION }}
       - name: Setup ~/bin directory
         run: |
           mkdir -p /home/runner/bin

diff --git a/.github/workflows/oembed-proxy_release.yml b/.github/workflows/oembed-proxy_release.yml
@@ -52,14 +52,17 @@ jobs:
           path: ndla/deploy
       - uses: actions/setup-python@v4
         with:
-          python-version: '3.11'
+          python-version: ${{ vars.PYTHON_VERSION }}
       - uses: abatilo/actions-poetry@v2
         with:
-          poetry-version: "1.6.1"
+          poetry-version: ${{ vars.POETRY_VERSION }}
       - uses: actions/setup-java@v3
         with:
           distribution: temurin
           java-version: '20'
+      - uses: hashicorp/setup-terraform@v3
+        with:
+          terraform_version: ${{ vars.TERRAFORM_VERSION }}
       - name: Setup ~/bin directory
         run: |
           mkdir -p /home/runner/bin

diff --git a/.github/workflows/search-api_release.yml b/.github/workflows/search-api_release.yml
@@ -58,14 +58,17 @@ jobs:
           path: ndla/deploy
       - uses: actions/setup-python@v4
         with:
-          python-version: '3.11'
+          python-version: ${{ vars.PYTHON_VERSION }}
       - uses: abatilo/actions-poetry@v2
         with:
-          poetry-version: "1.6.1"
+          poetry-version: ${{ vars.POETRY_VERSION }}
       - uses: actions/setup-java@v3
         with:
           distribution: temurin
           java-version: '20'
+      - uses: hashicorp/setup-terraform@v3
+        with:
+          terraform_version: ${{ vars.TERRAFORM_VERSION }}
       - name: Setup ~/bin directory
         run: |
           mkdir -p /home/runner/bin

diff --git a/project/GithubWorkflowPlugin.scala b/project/GithubWorkflowPlugin.scala
@@ -117,14 +117,17 @@ object GithubWorkflowPlugin extends AutoPlugin {
        |          path: ndla/deploy
        |      - uses: actions/setup-python@v4
        |        with:
-       |          python-version: '3.11'
+       |          python-version: $${{ vars.PYTHON_VERSION }}
        |      - uses: abatilo/actions-poetry@v2
        |        with:
-       |          poetry-version: "1.6.1"
+       |          poetry-version: $${{ vars.POETRY_VERSION }}
        |      - uses: actions/setup-java@v3
        |        with:
        |          distribution: temurin
        |          java-version: '$workflowJavaVersion'
+       |      - uses: hashicorp/setup-terraform@v3
+       |        with:
+       |          terraform_version: $${{ vars.TERRAFORM_VERSION }}
        |      - name: Setup ~/bin directory
        |        run: |
        |          mkdir -p /home/runner/bin