Merge branch 'main' of github.com:cmcgee1024/swiftly into proxies-design

Author: cmcgee1024

.github/workflows/build_release.yml

@@ -0,0 +1,32 @@
+name: Build Release
+
+on:
+  workflow_dispatch:
+    inputs:
+      version:
+        description: "Version of swiftly to build release artifacts"
+        required: true
+        type: string
+        default: "0.3.0"
+      skip:
+        description: "Perform release checks, such as the git tag, and swift version, or '--skip' to skip that."
+        required: true
+        type: string
+        default: "--skip"
+
+jobs:
+  buildrelease:
+    name: Build Release
+    runs-on: ubuntu-latest
+    container:
+      image: "swift:6.0-rhel-ubi9"
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Build Artifact
+        run: swift run build-swiftly-release ${{ inputs.skip }} ${{ inputs.version }}
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v4
+        with:
+          path: .build/release/swiftly-*.tar.gz
+          if-no-files-found: error

.github/workflows/pull_request.yml

@@ -1,8 +1,10 @@
-name: Pull request
+name: Pull Request
 
 on:
   pull_request:
     types: [opened, reopened, synchronize]
+  push:
+    branches: [main]
 
 jobs:
   soundness:
@@ -21,24 +23,29 @@ jobs:
     name: Test
     uses: swiftlang/github-workflows/.github/workflows/swift_package_test.yml@main
     with:
-      # linux_os_versions: "[\"jammy\", \"noble\", \"focal\", \"amazonlinux2\", \"rhel-ubi9\", \"bookworm\", \"fedora39\"]"
-      # Not working: noble (compile error in TSC FileSystem), bookworm (missing memory.h), fedora39 (missing memory.h)
-      linux_os_versions: "[\"jammy\", \"focal\", \"rhel-ubi9\"]"
+      # Amazon Linux 2 won't work with GH infrastructure
+      linux_os_versions: "[\"jammy\", \"focal\", \"rhel-ubi9\", \"noble\", \"bookworm\", \"fedora39\"]"
       # We only care about the current stable release, because that's where we make our swiftly releases
       linux_exclude_swift_versions: "[{\"swift_version\": \"nightly-main\"},{\"swift_version\": \"nightly-6.0\"},{\"swift_version\": \"5.8\"},{\"swift_version\": \"5.9\"},{\"swift_version\": \"5.10\"}]"
-      linux_pre_build_command: ((apt-get update && apt-get -y install curl make) || ((curl --help || yum -y install curl) && yum -y install make)) && ./scripts/install-libarchive.sh
+      linux_pre_build_command: ./scripts/prep-gh-action.sh && ./scripts/install-libarchive.sh
       enable_windows_checks: false
 
-  releasebuild:
-    name: Release Build
-    uses: swiftlang/github-workflows/.github/workflows/swift_package_test.yml@main
-    with:
-      linux_os_versions: "[\"rhel-ubi9\"]"
-      # We only care about the current stable release, because that's where we make our swiftly releases
-      linux_exclude_swift_versions: "[{\"swift_version\": \"nightly-main\"},{\"swift_version\": \"nightly-6.0\"},{\"swift_version\": \"5.8\"},{\"swift_version\": \"5.9\"},{\"swift_version\": \"5.10\"}]"
-      linux_pre_build_command: echo ""
-      linux_build_command: swift run build-swiftly-release --skip 0.4.0
-      enable_windows_checks: false
+  releasebuildcheck:
+    name: Release Build Check
+    runs-on: ubuntu-latest
+    container:
+      image: "swift:6.0-rhel-ubi9"
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Build Artifact
+        run: swift run build-swiftly-release --skip "999.0.0"
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v4
+        with:
+          path: .build/release/swiftly-*.tar.gz
+          if-no-files-found: error
+          retention-days: 1
 
   formatcheck:
     name: Format Check
@@ -47,6 +54,6 @@ jobs:
       # We only need to run this with one swift release and on one of the linux distributions
       linux_os_versions: "[\"jammy\"]"
       linux_exclude_swift_versions: "[{\"swift_version\": \"nightly-main\"},{\"swift_version\": \"nightly-6.0\"},{\"swift_version\": \"5.8\"},{\"swift_version\": \"5.9\"},{\"swift_version\": \"5.10\"}]"
-      linux_pre_build_command: echo ""
+      linux_pre_build_command: ./scripts/prep-gh-action.sh
       linux_build_command: swift run swiftformat --lint --dryrun .
       enable_windows_checks: false

Package.resolved

@@ -17,7 +17,7 @@ let package = Package(
         .package(url: "https://github.com/apple/swift-argument-parser", from: "1.3.0"),
         .package(url: "https://github.com/swift-server/async-http-client", from: "1.21.2"),
         .package(url: "https://github.com/apple/swift-nio.git", from: "2.64.0"),
-        .package(url: "https://github.com/apple/swift-tools-support-core.git", from: "0.6.1"),
+        .package(url: "https://github.com/apple/swift-tools-support-core.git", from: "0.7.1"),
         .package(url: "https://github.com/apple/swift-docc-plugin", from: "1.3.0"),
         // This dependency provides the correct version of the formatter so that you can run `swift run swiftformat Package.swift Plugins/ Sources/ Tests/`
         .package(url: "https://github.com/nicklockwood/SwiftFormat", exact: "0.49.18"),

Package.swift

@@ -44,7 +44,6 @@ Target: x86_64-unknown-linux-gnu
 ## Platform support
 
 - Linux-based platforms listed on https://swift.org/download
-  - CentOS 7 will not be supported due to some dependencies of swiftly not supporting it, however.
 
 Right now, swiftly is in early stages of development and is supported on Linux and macOS. For more detailed information about swiftly's intended features and implementation, check out the [design document](DESIGN.md).