CI main branch fixes

swift-extras · Oct 26, 2020 · 737c152 · 737c152
1 parent b8af496
commit 737c152
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -2,10 +2,10 @@ name: CI
 on: 
   push:
     branches: 
-    - master
+    - main
   pull_request:
     branches: 
-    - master
+    - main
 
 jobs:
 

diff --git a/IntegrationTests/allocation-counter-tests-framework/run-allocation-counter.sh b/IntegrationTests/allocation-counter-tests-framework/run-allocation-counter.sh
@@ -24,6 +24,7 @@ function die() {
 
 function make_git_commit_all() {
     git init > /dev/null
+    git checkout -b main
     if [[ "$(git config user.email)" == "" ]]; then
         git config --local user.email [email protected]
         git config --local user.name 'Does Not Matter'
@@ -54,8 +55,8 @@ EOF
     cat <<EOF
     ],
     dependencies: [
-        .package(url: "HookedFunctions/", .branch("master")),
-        .package(url: "$swiftpm_pkg_name/", .branch("master")),
+        .package(url: "HookedFunctions/", .branch("main")),
+        .package(url: "$swiftpm_pkg_name/", .branch("main")),
 EOF
     if [[ -n "$extra_dependencies_file" ]]; then
         cat "$extra_dependencies_file"

diff --git a/...tionTests/allocation-counter-tests-framework/template/HookedFunctionsDoHook/Package.swift b/...tionTests/allocation-counter-tests-framework/template/HookedFunctionsDoHook/Package.swift
@@ -22,7 +22,7 @@ let package = Package(
         .library(name: "HookedFunctions", type: .dynamic, targets: ["HookedFunctions"]),
     ],
     dependencies: [
-        .package(url: "../AtomicCounter/", .branch("master")),
+        .package(url: "../AtomicCounter/", .branch("main")),
     ],
     targets: [
         .target(name: "HookedFunctions", dependencies: ["AtomicCounter"]),

diff --git a/...nTests/allocation-counter-tests-framework/template/HookedFunctionsDoNotHook/Package.swift b/...nTests/allocation-counter-tests-framework/template/HookedFunctionsDoNotHook/Package.swift
@@ -22,7 +22,7 @@ let package = Package(
         .library(name: "HookedFunctions", type: .dynamic, targets: ["HookedFunctions"]),
     ],
     dependencies: [
-        .package(url: "../AtomicCounter/", .branch("master")),
+        .package(url: "../AtomicCounter/", .branch("main")),
     ],
     targets: [
         .target(name: "HookedFunctions", dependencies: ["AtomicCounter"]),
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,10 +2,10 @@ name: CI @@
     on:
       push:
         branches:
-        - master
+        - main
       pull_request:
         branches:
-        - master
+        - main
     jobs:
@@ Expand Down @@