From 1490ce68a3bb65adb810c4b64fce6e8dd0f8ae39 Mon Sep 17 00:00:00 2001 From: "Codex (GPT 5)" Date: Thu, 30 Apr 2026 11:46:00 -0400 Subject: [PATCH 1/3] Modernize CI workflows Signed-off-by: Max Howell --- .github/workflows/cd.yml | 5 ++++- .github/workflows/checks.yml | 8 +++++++- .github/workflows/ci.yml | 23 +++++++++++++++++++---- Sources/Version.swift | 6 +++--- 4 files changed, 33 insertions(+), 9 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index cf0fb14..f79cd89 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -1,11 +1,14 @@ on: release: types: published +permissions: + contents: read + jobs: docs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v6 - uses: SwiftDocOrg/swift-doc@master with: module-name: Version diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index 82c7c1a..0eafc27 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -5,10 +5,16 @@ on: paths: - Sources/** - Tests/** + - Package.swift + - Package@swift-*.swift + - .github/workflows/checks.yml +permissions: + contents: read + jobs: macOS: runs-on: macos-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v6 - run: swift --version - run: swift test --parallel diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c002709..67c3df9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -5,10 +5,17 @@ on: paths: - Sources/** - Tests/** + - Package.swift + - Package@swift-*.swift - .github/workflows/ci.yml push: branches: master - paths: .github/workflows/ci.yml + paths: + - Sources/** + - Tests/** + - Package.swift + - Package@swift-*.swift + - .github/workflows/ci.yml schedule: - cron: '3 3 * * 4' # 3:03 AM, every Thursday @@ -16,15 +23,23 @@ concurrency: group: ${{ github.head_ref || 'scheduled' }} cancel-in-progress: true +permissions: + contents: read + jobs: macOS: runs-on: macos-latest + permissions: + contents: read + id-token: write steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - uses: mxcl/xcodebuild@v3 with: code-coverage: true - - uses: codecov/codecov-action@v1 + - uses: codecov/codecov-action@v5 + with: + use_oidc: true linux: runs-on: ubuntu-latest @@ -40,5 +55,5 @@ jobs: container: image: swift:${{ matrix.x.swift }} steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v6 - run: swift ${{ matrix.x.action }} diff --git a/Sources/Version.swift b/Sources/Version.swift index fea9375..ae1c443 100644 --- a/Sources/Version.swift +++ b/Sources/Version.swift @@ -95,7 +95,7 @@ extension Version: LosslessStringConvertible { func identifiers(start: String.Index?, end: String.Index) -> [String] { guard let start = start else { return [] } let identifiers = string[string.index(after: start).. [String] { guard let start = start else { return [] } let identifiers = string[string.index(after: start).. Date: Thu, 30 Apr 2026 11:50:49 -0400 Subject: [PATCH 2/3] Update README --- README.md | 19 ------------------- tea.yaml | 7 ------- 2 files changed, 26 deletions(-) delete mode 100644 tea.yaml diff --git a/README.md b/README.md index 57dedb2..e55c162 100644 --- a/README.md +++ b/README.md @@ -36,21 +36,6 @@ should need merge any fixes. [codecov]: https://codecov.io/gh/mxcl/Version [Swift Package Manager]: https://github.com/apple/swift-tools-support-core/blob/main/Sources/TSCUtility/Version.swift -# Support mxcl - -Hey there, I’m Max Howell. I’m a prolific producer of open source software and -probably you already use some of it (for example, I created [`brew`]). I work -full-time on open source and it’s hard; currently *I earn less than minimum -wage*. Please help me continue my work, I appreciate it 🙏🏻 - - - - - -[Other ways to say thanks](http://mxcl.dev/#donate). - -[`brew`]: https://brew.sh - # Usage ```swift @@ -82,10 +67,6 @@ SwiftPM: package.append(.package(url: "https://github.com/mxcl/Version.git", from: "2.0.0")) ``` -Carthage: - -> Waiting on: [@Carthage#1945](https://github.com/Carthage/Carthage/pull/1945). - ## Ranges Ranges work as you expect, but there are caveats for prerelease identifiers, diff --git a/tea.yaml b/tea.yaml deleted file mode 100644 index 404b095..0000000 --- a/tea.yaml +++ /dev/null @@ -1,7 +0,0 @@ -# https://tea.xyz/what-is-this-file -# created with https://mash.pkgx.sh/mxcl/tea-register ---- -version: 1.0.0 -codeOwners: - - '0x5E2DE4A68df811AAAD32d71fb065e6946fA5C8d9' # mxcl -quorum: 1 From 562476c769c2d17dbf8c8e41eedca1464cb6ffbf Mon Sep 17 00:00:00 2001 From: Max Howell Date: Thu, 30 Apr 2026 11:59:13 -0400 Subject: [PATCH 3/3] actions/checkout considered problematic --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 67c3df9..fb5b509 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -55,5 +55,5 @@ jobs: container: image: swift:${{ matrix.x.swift }} steps: - - uses: actions/checkout@v6 + - uses: actions/checkout@v1 # needs old version due to node dependency - run: swift ${{ matrix.x.action }}