Add support for Ubuntu 22.04 and Swift 5.7

sersoft-gmbh · Sep 13, 2022 · cdcf684 · cdcf684
1 parent 21deee3
commit cdcf684
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 10 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -38,13 +38,13 @@ jobs:
     name: Test Release Installation
     strategy:
       matrix:
-        swift-version: [5.5, 5.6.1]
-        os-version: ['ubuntu-20.04', 'ubuntu-18.04']
+        swift-version: [5.6.2, 5.7]
+        os-version: ['ubuntu-22.04', 'ubuntu-20.04']
         include:
-          - swift-version: 5.3
-            os-version: ubuntu-18.04
           - swift-version: 5.4
             os-version: ubuntu-20.04
+          - swift-version: 5.5
+            os-version: ubuntu-22.04
     runs-on: ${{matrix.os-version}}
     steps:
       - name: Install dependencies
@@ -86,11 +86,13 @@ jobs:
     name: Test Branch Installation
     strategy:
       matrix:
-        swift-version: [5.5, 5.6.1]
-        os-version: [ 'ubuntu-20.04', 'ubuntu-18.04' ]
+        swift-version: [5.6.2, 5.7]
+        os-version: ['ubuntu-22.04', 'ubuntu-20.04']
         include:
           - swift-version: 5.4
-            os-version: ubuntu-18.04
+            os-version: ubuntu-20.04
+          - swift-version: 5.5
+            os-version: ubuntu-22.04
     runs-on: ${{matrix.os-version}}
     steps:
       - name: Install dependencies
@@ -132,9 +134,9 @@ jobs:
     name: Test Release Installation w/o Platform
     strategy:
       matrix:
-        os-version: [ 'ubuntu-20.04', 'ubuntu-18.04' ]
+        os-version: [ 'ubuntu-22.04', 'ubuntu-20.04' ]
     env:
-      INPUT_SWIFT_VERSION: 5.6
+      INPUT_SWIFT_VERSION: 5.7
     runs-on: ${{matrix.os-version}}
     steps:
       - name: Install dependencies

diff --git a/src/main.ts b/src/main.ts
@@ -28,7 +28,7 @@ async function findMatchingRelease(releaseVersion: string, token: string): Promi
                     nodes {
                         name
                     }
-                } 
+                }
             }
         }
     `, { tagQuery: `swift-${releaseVersion}` });
@@ -166,6 +166,26 @@ async function main() {
                     'zlib1g-dev',
                 ];
                 break;
+             case 'ubuntu22.04':
+                 dependencies = [
+                     'binutils',
+                     'git',
+                     'unzip',
+                     'gnupg2',
+                     'libc6-dev',
+                     'libcurl4-openssl-dev',
+                     'libedit2',
+                     'libgcc-9-dev',
+                     'libpython3.8',
+                     'libsqlite3-0',
+                     'libstdc++-9-dev',
+                     'libxml2-dev',
+                     'libz3-dev',
+                     'pkg-config',
+                     'tzdata',
+                     'zlib1g-dev',
+                 ];
+                 break;
             default:
                 dependencies = [];
                 core.info(`Unknown platform '${swiftPlatform}' for dependency installation. Not installing anything...`);