swift-actions
diff --git a/‎.github/release-drafter.yml‎
Lines changed: 16 additions & 0 deletions b/‎.github/release-drafter.yml‎
Lines changed: 16 additions & 0 deletions
diff --git a/‎.github/workflows/analysis.yml‎
Lines changed: 70 additions & 0 deletions b/‎.github/workflows/analysis.yml‎
Lines changed: 70 additions & 0 deletions
diff --git a/‎.github/workflows/check_swift_releases.sh‎
Lines changed: 2 additions & 2 deletions b/‎.github/workflows/check_swift_releases.sh‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎.github/workflows/ci.yml‎
Lines changed: 6 additions & 3 deletions b/‎.github/workflows/ci.yml‎
Lines changed: 6 additions & 3 deletions
diff --git a/‎.github/workflows/draft-release.yml‎
Lines changed: 22 additions & 2 deletions b/‎.github/workflows/draft-release.yml‎
Lines changed: 22 additions & 2 deletions
diff --git a/‎.github/workflows/stability.yml‎
Lines changed: 35 additions & 0 deletions b/‎.github/workflows/stability.yml‎
Lines changed: 35 additions & 0 deletions
diff --git a/‎.github/workflows/swift-releases.yml‎
Lines changed: 1 addition & 1 deletion b/‎.github/workflows/swift-releases.yml‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎README.md‎
Lines changed: 13 additions & 13 deletions b/‎README.md‎
Lines changed: 13 additions & 13 deletions
diff --git a/‎__tests__/get-version.test.ts‎
Lines changed: 32 additions & 0 deletions b/‎__tests__/get-version.test.ts‎
Lines changed: 32 additions & 0 deletions
diff --git a/‎__tests__/gpg.test.ts‎
Lines changed: 24 additions & 6 deletions b/‎__tests__/gpg.test.ts‎
Lines changed: 24 additions & 6 deletions
@@ -1,3 +1,5 @@
+name-template: '$RESOLVED_VERSION'
+tag-template: 'v$RESOLVED_VERSION'
 exclude-labels:
   - 'tooling'
   - 'documentation'
@@ -12,5 +14,19 @@ categories:
     label: 'bug'
   - title: 'Dependencies'
     label: 'dependencies'
+version-resolver:
+  major:
+    labels:
+      - 'major'
+      - 'breaking'
+  minor:
+    labels:
+      - 'minor'
+      - 'enhancement'
+  patch:
+    labels:
+      - 'patch'
+      - 'bug'
+  default: patch
 template: |
   $CHANGES
@@ -0,0 +1,70 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ main ]
+  schedule:
+    - cron: '27 8 * * 6'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'javascript', 'typescript' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
+        # Learn more about CodeQL language support at https://git.io/codeql-language-support
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v2
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v2
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v2
@@ -2,7 +2,7 @@
 latest_release_name=`hub api repos/apple/swift/releases/latest | jq '.name'`
 exp="[0-9\.]"
 re="Swift ([0-9\.]+)"
-if [[ $latest_release_name =~ $re ]]
+if [[ "$latest_release_name" =~ "$re" ]]
 then 
   latest_release_number=${BASH_REMATCH[1]}
 else
@@ -12,7 +12,7 @@ fi
 
 echo "Latest release is $latest_release_number"
 
-if grep -q $latest_release_number "./src/swift-versions.ts"
+if grep -q "$latest_release_number" "./src/swift-versions.ts"
 then
   echo "Version already added"
   exit 0
 
@@ -13,7 +13,7 @@ jobs:
     name: Unit tests
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - run: npm install
     - run: npm run format-check
     - run: npm test
@@ -23,9 +23,12 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        swift: ["5.3"]
+        swift: ["5.6.1"]
+        include:
+        - os: windows-latest
+          swift: "5.3"
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - run: npm install
     - run: npm run build && npm run pack-source-map
     - uses: ./
 
@@ -7,9 +7,29 @@ on:
 
 jobs:
   update-release-draft:
-    name: Update Release Draft
+    name: Update Release
     runs-on: ubuntu-latest
     steps:
-      - uses: release-drafter/release-drafter@v5
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Update Release Draft
+        id: release_draft
+        uses: release-drafter/release-drafter@v5
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          
+      - name: Set version
+        run: npm version ${{ steps.release_draft.outputs.name }} --allow-same-version true --git-tag-version false
+
+      - name: Install Dependencies
+        run: npm install
+
+      - name: Build
+        run: npm run all
+
+      - name: Commit 
+        uses: EndBug/add-and-commit@v9
+        with:
+          push: origin main --force
+      
@@ -0,0 +1,35 @@
+name: Stability
+
+on:
+  schedule:
+    - cron:  '0 */12 * * *'
+
+jobs:
+  v1:
+    name: "v1: Swift ${{ matrix.swift }} on ${{ matrix.os }}"
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest]
+        swift: ["5.6.1"]
+    steps:
+    - uses: swift-actions/setup-swift@v1
+      with:
+        swift-version: ${{ matrix.swift }}
+    - name: Swift version
+      if: always()
+      run: swift --version | grep ${{ matrix.swift }} || exit 1
+  main:
+    name: "main: Swift ${{ matrix.swift }} on ${{ matrix.os }}"
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest]
+        swift: ["5.6.1"]
+    steps:
+    - uses: swift-actions/setup-swift@main
+      with:
+        swift-version: ${{ matrix.swift }}
+    - name: Swift version
+      if: always()
+      run: swift --version | grep ${{ matrix.swift }} || exit 1
@@ -9,7 +9,7 @@ jobs:
     name: Swift release
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     - run: ./.github/workflows/check_swift_releases.sh
@@ -7,10 +7,10 @@
     <img src="https://img.shields.io/badge/platform-macOS%20%7C%20Ubuntu-lightgray" alt="Supports macOS and Ubuntu" />
   </a>
   <a href="https://swift.org">
-    <img src="https://img.shields.io/badge/Swift-5.3-F05138?logo=swift&logoColor=white" alt="Swift 5.3" />
+    <img src="https://img.shields.io/badge/Swift-5.6.1-F05138?logo=swift&logoColor=white" alt="Swift 5.6.1" />
   </a>
-  <a href="https://github.com/fwal/setup-swift/releases/latest">
-    <img src="https://img.shields.io/github/v/release/fwal/setup-swift?sort=semver" alt="Latest release" />
+  <a href="https://github.com/swift-actions/setup-swift/releases/latest">
+    <img src="https://img.shields.io/github/v/release/swift-actions/setup-swift?sort=semver" alt="Latest release" />
   </a>
 </p>
 
@@ -21,20 +21,20 @@
 To run the action with the latest swift version available, simply add the action as a step in your workflow:
 
 ```yaml
-- uses: fwal/setup-swift@v1
+- uses: swift-actions/setup-swift@v1
 ```
 
 After the environment is configured you can run swift commands using the standard [`run`](https://help.github.com/en/actions/automating-your-workflow-with-github-actions/workflow-syntax-for-github-actions#jobsjob_idstepsrun) step:
 ```yaml
-- uses: fwal/setup-swift@v1
+- uses: swift-actions/setup-swift@v1
 - name: Get swift version
-  run: swift --version # Swift 5.3
+  run: swift --version # Swift 5.6.1
 ```
 
 A specific Swift version can be set using the `swift-version` input:
 
 ```yaml
-- uses: fwal/setup-swift@v1
+- uses: swift-actions/setup-swift@v1
   with:
     swift-version: "5.1.0"
 - name: Get swift version
@@ -49,9 +49,9 @@ runs-on: ${{ matrix.os }}
 strategy:
   matrix:
     os: [ubuntu-latest, macos-latest]
-    swift: ["5.1.0", "4.2.4"]
+    swift: ["5.4.3", "5.2.4"]
 steps:
-- uses: fwal/setup-swift@v1
+- uses: swift-actions/setup-swift@v1
   with:
     swift-version: ${{ matrix.swift }}
 - name: Get swift version
@@ -68,22 +68,22 @@ For example, Swift is available as version `5.1` but this will be interpreted as
 In other words specifying...
 - `"5.1.0"` will resolve to version `5.1`
 - `"5.1"` will resolve to latest patch version (aka `5.1.1`)
-- `"5"` will resolve to latest minor and patch version (aka `5.3.0`)
+- `"5"` will resolve to latest minor and patch version (aka `5.5`)
 
 ### Caveats
 
-YAML interprets eg. `5.0` as a float, this action will then interpret that as `5` which will result in eg. Swift 5.3 being resolved. Quote your inputs! Thus:
+YAML interprets eg. `5.0` as a float, this action will then interpret that as `5` which will result in eg. Swift 5.5 being resolved. Quote your inputs! Thus:
 
 ```
-- uses: fwal/setup-swift@v1
+- uses: swift-actions/setup-swift@v1
   with:
     swift-version: '5.0'
 ```
 
 Not:
 
 ```
-- uses: fwal/setup-swift@v1
+- uses: swift-actions/setup-swift@v1
   with:
     swift-version: 5.0
 ```
 
@@ -0,0 +1,32 @@
+import { versionFromString } from "../src/get-version";
+
+describe("version lookup", () => {
+  it("identifies version from swift version", async () => {
+    const version = versionFromString(
+      "Apple Swift version 5.4.2 (swiftlang-1205.0.28.2 clang-1205.0.19.57)"
+    );
+    expect(version).toBe("5.4.2");
+  });
+
+  it("identifies version from swift version with target", async () => {
+    const version = versionFromString(
+      `Apple Swift version 5.5 (swiftlang-1300.0.31.1 clang-1300.0.29.1)
+Target: x86_64-apple-macosx11.0`
+    );
+    expect(version).toBe("5.5");
+  });
+
+  it("identifies version from swift-driver version", async () => {
+    const version = versionFromString(
+      "swift-driver version: 1.26.9 Apple Swift version 5.5 (swiftlang-1300.0.31.1 clang-1300.0.29.1)"
+    );
+    expect(version).toBe("5.5");
+  });
+
+  it("identifies version from swift version on linux", async () => {
+    const version = versionFromString(
+      "Swift version 5.5.1 (swift-5.5.1-RELEASE)"
+    );
+    expect(version).toBe("5.5.1");
+  });
+});
@@ -16,21 +16,39 @@ describe("gpg", () => {
     expect(mockExec).toBeCalledTimes(1);
   });
 
-  it("uses the next keyserver in the pool if the previous fails", async () => {
-    const failingServers = 3;
-    let testedServers = 0;
+  // NOTE: Currently disabled as the pool only contains one server
+  // it("uses the next keyserver in the pool if the previous fails", async () => {
+  //   const failingServers = 3;
+  //   let testedServers = 0;
+
+  //   mockExec.mockImplementation(() => {
+  //     testedServers++;
+  //     if (testedServers >= failingServers) {
+  //       return Promise.resolve(0);
+  //     } else {
+  //       return Promise.resolve(1);
+  //     }
+  //   });
+
+  //   await refreshKeys();
+  //   expect(mockExec).toBeCalledTimes(3);
+  // });
+
+  it("makes a second attempt if the keyserver fails", async () => {
+    const attempts = 2;
+    let tests = 0;
 
     mockExec.mockImplementation(() => {
-      testedServers++;
-      if (testedServers >= failingServers) {
+      tests++;
+      if (tests >= attempts) {
         return Promise.resolve(0);
       } else {
         return Promise.resolve(1);
       }
     });
 
     await refreshKeys();
-    expect(mockExec).toBeCalledTimes(3);
+    expect(mockExec).toBeCalledTimes(2);
   });
 
   it("throws an error if all servers in the pool fails", async () => {