Merge branch 'main' into hd-uri-decoder-refactor-deepObject

apple · Nov 19, 2024 · 570666b · 570666b
2 parents 78da857 + 2cb09fb
commit 570666b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/.github/workflows/scheduled.yml → .github/workflows/main.yml b/.github/workflows/scheduled.yml → .github/workflows/main.yml
@@ -1,6 +1,8 @@
-name: Scheduled
+name: Main
 
 on:
+  push:
+    branches: [main]
   schedule:
     - cron: "0 8,20 * * *"
 

diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -28,8 +28,3 @@ jobs:
       name: "Integration test"
       matrix_linux_command: "apt-get update -yq && apt-get install -yq jq && ./scripts/run-integration-test.sh"
       matrix_linux_nightly_main_enabled: false
-
-  swift-6-language-mode:
-    name: Swift 6 Language Mode
-    uses: apple/swift-nio/.github/workflows/swift_6_language_mode.yml@main
-    if: false  # Disabled for now.