From b9283cc2e17d12897ed17f69c270188cee3ececd Mon Sep 17 00:00:00 2001 From: soumyamahunt Date: Thu, 15 Dec 2022 14:06:09 +0530 Subject: [PATCH 1/2] ci: parallelize macos runner tests on the same runner --- .github/workflows/main.yml | 70 +++++--------------------------------- package.json | 2 +- 2 files changed, 9 insertions(+), 63 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2ba4e233..d88ad5cf 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -26,7 +26,7 @@ jobs: # analyze: # name: Analyze # if: github.event_name != 'workflow_dispatch' - # uses: SwiftyLab/ci/.github/workflows/codeql-analysis.yml@main + # uses: SwiftyLab/ci/.github/workflows/codeql-analysis.yml@parallel # permissions: # actions: read # contents: read @@ -46,7 +46,7 @@ jobs: swift-package-test: name: Swift Package - uses: SwiftyLab/ci/.github/workflows/swift-package.yml@main + uses: SwiftyLab/ci/.github/workflows/swift-package.yml@parallel secrets: inherit with: codecov-swift: '5.7' @@ -67,75 +67,21 @@ jobs: cocoapods-test: name: CocoaPods - uses: SwiftyLab/ci/.github/workflows/cocoapods.yml@main - with: - matrix: > - { - "include": [ - { - "os": "macos-12", - "xcode": "latest-stable", - "platform": "macos" - }, - { - "os": "macos-12", - "xcode": "latest-stable", - "platform": "watchos" - }, - { - "os": "macos-12", - "xcode": "latest-stable", - "platform": "tvos" - }, - { - "os": "macos-12", - "xcode": "latest-stable", - "platform": "ios" - } - ] - } + uses: SwiftyLab/ci/.github/workflows/cocoapods.yml@parallel xcode-test: name: Xcode - uses: SwiftyLab/ci/.github/workflows/xcode.yml@main + uses: SwiftyLab/ci/.github/workflows/xcode.yml@parallel with: - matrix: > - { - "include": [ - { - "os": "macos-12", - "xcode": "latest-stable", - "platform": "macOS" - }, - { - "os": "macos-12", - "xcode": "latest-stable", - "platform": "watchOS" - }, - { - "os": "macos-12", - "xcode": "latest-stable", - "platform": "tvOS" - }, - { - "os": "macos-12", - "xcode": "latest-stable", - "platform": "iOS" - }, - { - "os": "macos-12", - "xcode": "latest-stable", - "platform": "mac-catalyst" - } - ] - } + os: macos-12 + xcode: '13.3.1' ci: name: CI if: github.event_name == 'push' needs: [swift-package-test, xcode-test, cocoapods-test] # needs: [analyze, swift-package-test, xcode-test, cocoapods-test] - uses: SwiftyLab/ci/.github/workflows/ci.yml@main + uses: SwiftyLab/ci/.github/workflows/ci.yml@parallel cd: name: CD @@ -151,7 +97,7 @@ jobs: # (needs.analyze.result == 'success' || needs.analyze.result == 'skipped') needs: [ci, swift-package-test, xcode-test, cocoapods-test] # needs: [ci, analyze, swift-package-test, xcode-test, cocoapods-test] - uses: SwiftyLab/ci/.github/workflows/cd.yml@main + uses: SwiftyLab/ci/.github/workflows/cd.yml@parallel with: os: macos-12 version: ${{ github.event.inputs.version }} diff --git a/package.json b/package.json index 9016b5b4..ebc4deb9 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ }, "private": true, "dependencies": { - "swiftylab-ci": "github:SwiftyLab/ci" + "swiftylab-ci": "github:SwiftyLab/ci#parallel" }, "scripts": { "build": "npm exec --package=swiftylab-ci -- build.js", From 84cee98a1922fefe0b7ba7c377370aebd260b4e5 Mon Sep 17 00:00:00 2001 From: soumyamahunt Date: Thu, 15 Dec 2022 14:44:20 +0530 Subject: [PATCH 2/2] wip: switch back to default ci branch --- .github/workflows/main.yml | 12 ++++++------ package.json | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d88ad5cf..1d4c6169 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -26,7 +26,7 @@ jobs: # analyze: # name: Analyze # if: github.event_name != 'workflow_dispatch' - # uses: SwiftyLab/ci/.github/workflows/codeql-analysis.yml@parallel + # uses: SwiftyLab/ci/.github/workflows/codeql-analysis.yml@main # permissions: # actions: read # contents: read @@ -46,7 +46,7 @@ jobs: swift-package-test: name: Swift Package - uses: SwiftyLab/ci/.github/workflows/swift-package.yml@parallel + uses: SwiftyLab/ci/.github/workflows/swift-package.yml@main secrets: inherit with: codecov-swift: '5.7' @@ -67,11 +67,11 @@ jobs: cocoapods-test: name: CocoaPods - uses: SwiftyLab/ci/.github/workflows/cocoapods.yml@parallel + uses: SwiftyLab/ci/.github/workflows/cocoapods.yml@main xcode-test: name: Xcode - uses: SwiftyLab/ci/.github/workflows/xcode.yml@parallel + uses: SwiftyLab/ci/.github/workflows/xcode.yml@main with: os: macos-12 xcode: '13.3.1' @@ -81,7 +81,7 @@ jobs: if: github.event_name == 'push' needs: [swift-package-test, xcode-test, cocoapods-test] # needs: [analyze, swift-package-test, xcode-test, cocoapods-test] - uses: SwiftyLab/ci/.github/workflows/ci.yml@parallel + uses: SwiftyLab/ci/.github/workflows/ci.yml@main cd: name: CD @@ -97,7 +97,7 @@ jobs: # (needs.analyze.result == 'success' || needs.analyze.result == 'skipped') needs: [ci, swift-package-test, xcode-test, cocoapods-test] # needs: [ci, analyze, swift-package-test, xcode-test, cocoapods-test] - uses: SwiftyLab/ci/.github/workflows/cd.yml@parallel + uses: SwiftyLab/ci/.github/workflows/cd.yml@main with: os: macos-12 version: ${{ github.event.inputs.version }} diff --git a/package.json b/package.json index ebc4deb9..9016b5b4 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ }, "private": true, "dependencies": { - "swiftylab-ci": "github:SwiftyLab/ci#parallel" + "swiftylab-ci": "github:SwiftyLab/ci" }, "scripts": { "build": "npm exec --package=swiftylab-ci -- build.js",