Update ubuntu version as 20.04 is being deprecated

openziti · Feb 7, 2025 · 638f37b · 638f37b
1 parent 6d0737b
commit 638f37b
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 13 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -99,7 +99,7 @@ jobs:
 
   linux-build:
     name: Build Linux binaries
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Git Checkout
         uses: actions/checkout@v4
@@ -135,7 +135,7 @@ jobs:
 
   tests:
     name: Run Unit and Integration Tests
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - name: Git Checkout
         uses: actions/checkout@v4
@@ -166,7 +166,7 @@ jobs:
     name: Fablab Smoketest
     # not applicable to forks. shouldn't run on release build
     if: github.repository_owner == 'openziti' && !startsWith(github.ref_name, 'release-v')
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - name: Git Checkout
         uses: actions/checkout@v4
@@ -180,6 +180,11 @@ jobs:
 
       - name: Install Ziti CI
         uses: openziti/ziti-ci@v1
+
+      - name: Install Terraform
+        uses: hashicorp/setup-terraform@v3
+        with:
+          terraform_version: "1.5.5"
 
       - name: Build and Test
         env:
@@ -253,9 +258,14 @@ jobs:
     name: Teardown SmokeTest
     # ensure reasonable timeout-minutes on steps in this un-cancellable job
     if: always()
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     needs: [ fablab-smoketest ]
     steps:
+      - name: Install Terraform
+        uses: hashicorp/setup-terraform@v3
+        with:
+          terraform_version: "1.5.5"
+
       # release cloud resources if the smoketest succeeded, failed, or was cancelled; unnecessary if skipped
       - name: Teardown Test Environment
         if: needs.fablab-smoketest.result != 'skipped'
@@ -282,7 +292,7 @@ jobs:
     name: Fablab HA Smoketest
     # not applicable to forks. shouldn't run on release build
     if: github.repository_owner == 'openziti' && !startsWith(github.ref_name, 'release-v')
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - name: Git Checkout
         uses: actions/checkout@v4
@@ -294,6 +304,11 @@ jobs:
         with:
           go-version-file: ./go.mod
 
+      - name: Install Terraform
+        uses: hashicorp/setup-terraform@v3
+        with:
+          terraform_version: "1.5.5"
+
       - name: Install Ziti CI
         uses: openziti/ziti-ci@v1
 
@@ -366,9 +381,14 @@ jobs:
   fablab-ha-smoketest-teardown:
     name: Teardown HA SmokeTest
     if: always()
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     needs: [ fablab-ha-smoketest ]
     steps:
+      - name: Install Terraform
+        uses: hashicorp/setup-terraform@v3
+        with:
+          terraform_version: "1.5.5"
+
       # release cloud resources if the smoketest succeeded, failed, or was cancelled; unnecessary if skipped
       - name: Teardown Test Environment
         if: needs.fablab-smoketest-ha.result != 'skipped'
@@ -402,7 +422,7 @@ jobs:
       && (needs.fablab-smoketest.result == 'success' || needs.fablab-smoketest.result == 'skipped')
       && (needs.tests.result == 'success')
       }}
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     # ensure required job outcomes are specified in "if" expression
     needs: [ tests, linux-build, mac-os-build, windows-build, fablab-smoketest, fablab-ha-smoketest ]
     outputs:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -82,7 +82,7 @@ jobs:
 
   linux-build:
     name: Build Linux binaries
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Git Checkout
         uses: actions/checkout@v4
@@ -120,7 +120,7 @@ jobs:
 
   tests:
     name: Run Unit and Integration Tests
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Git Checkout
         uses: actions/checkout@v4
@@ -160,7 +160,7 @@ jobs:
       }}
     # ensure required job outcomes are specified in "if" expression
     needs: [ tests, linux-build, mac-os-build, windows-build ]
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     outputs:
       ZITI_VERSION: ${{ steps.get_version.outputs.ZITI_VERSION }}
     steps:

diff --git a/.github/workflows/validation-links.yml b/.github/workflows/validation-links.yml
@@ -22,7 +22,7 @@ jobs:
     name: Link Validation
     # not applicable to forks. shouldn't run on release build
     if: github.repository_owner == 'openziti'
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - name: Git Checkout
         uses: actions/checkout@v4
@@ -37,6 +37,11 @@ jobs:
       - name: Install Ziti CI
         uses: openziti/ziti-ci@v1
 
+      - name: Install Terraform
+        uses: hashicorp/setup-terraform@v3
+        with:
+          terraform_version: "1.5.5"
+
       - name: Build and Test
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -83,4 +88,4 @@ jobs:
         if: always()
         shell: bash
         run: |
-          $(go env GOPATH)/bin/links-test dispose
+          $(go env GOPATH)/bin/links-test dispose
diff --git a/.github/workflows/validation-sdk-terminators.yml b/.github/workflows/validation-sdk-terminators.yml
@@ -22,7 +22,7 @@ jobs:
     name: SDK Terminator Validation
     # not applicable to forks. shouldn't run on release build
     if: github.repository_owner == 'openziti'
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - name: Git Checkout
         uses: actions/checkout@v4
@@ -37,6 +37,11 @@ jobs:
       - name: Install Ziti CI
         uses: openziti/ziti-ci@v1
 
+      - name: Install Terraform
+        uses: hashicorp/setup-terraform@v3
+        with:
+          terraform_version: "1.5.5"
+
       - name: Build and Test
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}