From 0245bc9e14288d57435ca54e7089a6f9634c8d69 Mon Sep 17 00:00:00 2001 From: ordo-ci Date: Thu, 7 Sep 2023 13:23:23 +0000 Subject: [PATCH 01/39] =?UTF-8?q?ci:=20=F0=9F=94=84=20synced=20local=20'.g?= =?UTF-8?q?ithub/workflows/'=20with=20remote=20'workflows/swift'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/semantic-release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/semantic-release.yml b/.github/workflows/semantic-release.yml index 212452e..688de91 100644 --- a/.github/workflows/semantic-release.yml +++ b/.github/workflows/semantic-release.yml @@ -58,8 +58,8 @@ jobs: - name: Install semantic-release run: | - npm install semantic-release conventional-changelog-conventionalcommits -D - + npm install semantic-release conventional-changelog-conventionalcommits@6.1.0 -D + npm list - name: Release env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 7a2778d1f9f43bcf0451e2a1f373ad5c66dad7f6 Mon Sep 17 00:00:00 2001 From: ordo-ci Date: Wed, 20 Sep 2023 06:33:22 +0000 Subject: [PATCH 02/39] =?UTF-8?q?ci:=20=F0=9F=94=84=20synced=20local=20'.g?= =?UTF-8?q?ithub/workflows/'=20with=20remote=20'workflows/swift'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/semantic-release.yml | 4 ++-- .github/workflows/swift-linux-build.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/semantic-release.yml b/.github/workflows/semantic-release.yml index 688de91..85c763b 100644 --- a/.github/workflows/semantic-release.yml +++ b/.github/workflows/semantic-release.yml @@ -54,11 +54,11 @@ jobs: - name: Setup Node.js uses: actions/setup-node@v3 with: - node-version: "lts/*" + node-version: '18' - name: Install semantic-release run: | - npm install semantic-release conventional-changelog-conventionalcommits@6.1.0 -D + npm install semantic-release conventional-changelog-conventionalcommits -D npm list - name: Release env: diff --git a/.github/workflows/swift-linux-build.yml b/.github/workflows/swift-linux-build.yml index c189e5f..44ceec1 100644 --- a/.github/workflows/swift-linux-build.yml +++ b/.github/workflows/swift-linux-build.yml @@ -20,7 +20,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - - uses: fwal/setup-swift@v1.23.0 + - uses: fwal/setup-swift@v1.24.0 with: swift-version: ${{ matrix.swift }} From 6056e265b606c843207ffec086de479c4a391ce0 Mon Sep 17 00:00:00 2001 From: ordo-ci Date: Fri, 22 Sep 2023 06:11:46 +0000 Subject: [PATCH 03/39] =?UTF-8?q?ci:=20=F0=9F=94=84=20synced=20local=20'.g?= =?UTF-8?q?ithub/workflows/'=20with=20remote=20'workflows/swift'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/swift-code-coverage.yml | 3 +++ .github/workflows/swift-linux-build.yml | 3 +++ .github/workflows/swift-macos-build.yml | 5 +++++ .github/workflows/swift-sanitizer-address.yml | 3 +++ .github/workflows/swift-sanitizer-thread.yml | 3 +++ 5 files changed, 17 insertions(+) diff --git a/.github/workflows/swift-code-coverage.yml b/.github/workflows/swift-code-coverage.yml index d60e2c8..30434d2 100644 --- a/.github/workflows/swift-code-coverage.yml +++ b/.github/workflows/swift-code-coverage.yml @@ -18,6 +18,9 @@ jobs: run: | sudo apt-get install -y libjemalloc-dev llvm-15 + - name: Start consul + uses: ./.github/actions/consul-start + - name: Run tests continue-on-error: true run: | diff --git a/.github/workflows/swift-linux-build.yml b/.github/workflows/swift-linux-build.yml index 44ceec1..fb5d8bc 100644 --- a/.github/workflows/swift-linux-build.yml +++ b/.github/workflows/swift-linux-build.yml @@ -26,6 +26,9 @@ jobs: - uses: actions/checkout@v3 + - name: Start consul + uses: ./.github/actions/consul-start + - name: Ubuntu deps if: ${{ runner.os == 'Linux' }} run: | diff --git a/.github/workflows/swift-macos-build.yml b/.github/workflows/swift-macos-build.yml index 9e5dac6..ddfe0b6 100644 --- a/.github/workflows/swift-macos-build.yml +++ b/.github/workflows/swift-macos-build.yml @@ -29,7 +29,12 @@ jobs: echo "/opt/homebrew/bin:/usr/local/bin" >> $GITHUB_PATH echo BENCHMARK_DISABLE_JEMALLOC=true >> $GITHUB_ENV brew install jemalloc + - uses: actions/checkout@v3 + + - name: Start consul + uses: ./.github/actions/consul-start + - name: Swift version run: swift --version - name: Build diff --git a/.github/workflows/swift-sanitizer-address.yml b/.github/workflows/swift-sanitizer-address.yml index 82217a2..0fa9418 100644 --- a/.github/workflows/swift-sanitizer-address.yml +++ b/.github/workflows/swift-sanitizer-address.yml @@ -31,6 +31,9 @@ jobs: - uses: actions/checkout@v3 + - name: Start consul + uses: ./.github/actions/consul-start + - name: Swift version run: swift --version diff --git a/.github/workflows/swift-sanitizer-thread.yml b/.github/workflows/swift-sanitizer-thread.yml index c187150..943994d 100644 --- a/.github/workflows/swift-sanitizer-thread.yml +++ b/.github/workflows/swift-sanitizer-thread.yml @@ -32,6 +32,9 @@ jobs: - uses: actions/checkout@v3 + - name: Start consul + uses: ./.github/actions/consul-start + - name: Swift version run: swift --version From 2ad0e893ab796e07e218512463c7065ca75e9c25 Mon Sep 17 00:00:00 2001 From: ordo-ci Date: Fri, 22 Sep 2023 06:11:46 +0000 Subject: [PATCH 04/39] =?UTF-8?q?ci:=20=F0=9F=94=84=20created=20local=20'.?= =?UTF-8?q?github/actions/'=20from=20remote=20'actions'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/actions/consul-start/action.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 .github/actions/consul-start/action.yml diff --git a/.github/actions/consul-start/action.yml b/.github/actions/consul-start/action.yml new file mode 100644 index 0000000..f627212 --- /dev/null +++ b/.github/actions/consul-start/action.yml @@ -0,0 +1,13 @@ +name: "Start Consul" +runs: + using: "composite" + steps: + - uses: nahsi/setup-hashi-tool@v1 + if: github.repository == 'ordo-one/package-consul' || github.repository == 'ordo-one/package-distributed-system' + with: + name: consul + - name: Start consul + if: github.repository == 'ordo-one/package-consul' || github.repository == 'ordo-one/package-distributed-system' + shell: bash + run: | + consul agent -dev -log-level=warn & From bbdc98276fc94a8cd3bf9620fb5922c3fee971c6 Mon Sep 17 00:00:00 2001 From: ordo-ci Date: Mon, 20 Nov 2023 08:14:17 +0000 Subject: [PATCH 05/39] =?UTF-8?q?ci:=20=F0=9F=94=84=20synced=20local=20'.g?= =?UTF-8?q?ithub/workflows/'=20with=20remote=20'workflows/swift'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/swift-benchmark-delta.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/swift-benchmark-delta.yml b/.github/workflows/swift-benchmark-delta.yml index e724c5e..26c04af 100644 --- a/.github/workflows/swift-benchmark-delta.yml +++ b/.github/workflows/swift-benchmark-delta.yml @@ -32,6 +32,9 @@ jobs: run: | sudo apt-get install -y libjemalloc-dev + - name: Start consul + uses: ./.github/actions/consul-start + - name: Git URL token override and misc run: | #git config --global url."https://ordo-ci:${{ secrets.CI_MACHINE_PAT }}@github.com".insteadOf "https://github.com" From 0aaa0d0bc271b22c7d14493eaf3efa4324862625 Mon Sep 17 00:00:00 2001 From: ordo-ci Date: Mon, 20 Nov 2023 08:45:42 +0000 Subject: [PATCH 06/39] =?UTF-8?q?ci:=20=F0=9F=94=84=20synced=20local=20'.g?= =?UTF-8?q?ithub/workflows/'=20with=20remote=20'workflows/swift'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/swift-linux-build.yml | 2 +- .github/workflows/swift-macos-build.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/swift-linux-build.yml b/.github/workflows/swift-linux-build.yml index fb5d8bc..3027fdc 100644 --- a/.github/workflows/swift-linux-build.yml +++ b/.github/workflows/swift-linux-build.yml @@ -14,7 +14,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest] - swift: ["5.7", "5.8"] + swift: ["5.7", "5.8", "5.9"] runs-on: ${{ matrix.os }} diff --git a/.github/workflows/swift-macos-build.yml b/.github/workflows/swift-macos-build.yml index ddfe0b6..a4278e7 100644 --- a/.github/workflows/swift-macos-build.yml +++ b/.github/workflows/swift-macos-build.yml @@ -14,7 +14,7 @@ jobs: fail-fast: false matrix: os: [macos-13] - swift: ["5.7", "5.8"] + swift: ["5.7", "5.8", "5.9"] runs-on: ${{ matrix.os }} From 7ab5b397f6f249bcc0f442667c18131e0b7a2b14 Mon Sep 17 00:00:00 2001 From: ordo-ci Date: Mon, 20 Nov 2023 09:49:35 +0000 Subject: [PATCH 07/39] =?UTF-8?q?ci:=20=F0=9F=94=84=20synced=20local=20'.g?= =?UTF-8?q?ithub/workflows/'=20with=20remote=20'workflows/swift'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/swift-linux-build.yml | 2 +- .github/workflows/swift-macos-build.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/swift-linux-build.yml b/.github/workflows/swift-linux-build.yml index 3027fdc..47dbae3 100644 --- a/.github/workflows/swift-linux-build.yml +++ b/.github/workflows/swift-linux-build.yml @@ -20,7 +20,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - - uses: fwal/setup-swift@v1.24.0 + - uses: fwal/setup-swift@v1 with: swift-version: ${{ matrix.swift }} diff --git a/.github/workflows/swift-macos-build.yml b/.github/workflows/swift-macos-build.yml index a4278e7..6a26313 100644 --- a/.github/workflows/swift-macos-build.yml +++ b/.github/workflows/swift-macos-build.yml @@ -19,7 +19,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - - uses: fwal/setup-swift@v1.24.0 + - uses: fwal/setup-swift@v1 with: swift-version: ${{ matrix.swift }} From 9e0031b2aa5de3f292370e77d20a364bbda1ebf6 Mon Sep 17 00:00:00 2001 From: ordo-ci Date: Tue, 28 Nov 2023 08:37:54 +0000 Subject: [PATCH 08/39] =?UTF-8?q?ci:=20=F0=9F=94=84=20synced=20local=20'.g?= =?UTF-8?q?ithub/workflows/'=20with=20remote=20'workflows/swift'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/swift-code-coverage.yml | 2 +- .github/workflows/swift-linux-build.yml | 6 ++++-- .github/workflows/swift-macos-build.yml | 2 +- .github/workflows/swift-sanitizer-address.yml | 2 +- .github/workflows/swift-sanitizer-thread.yml | 2 +- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/swift-code-coverage.yml b/.github/workflows/swift-code-coverage.yml index 30434d2..706824e 100644 --- a/.github/workflows/swift-code-coverage.yml +++ b/.github/workflows/swift-code-coverage.yml @@ -5,7 +5,7 @@ on: push: branches: [ main ] pull_request: - branches: [ main ] + branches: [ main, next ] jobs: test-code-coverage: runs-on: [ubuntu-22.04] diff --git a/.github/workflows/swift-linux-build.yml b/.github/workflows/swift-linux-build.yml index 47dbae3..94944bf 100644 --- a/.github/workflows/swift-linux-build.yml +++ b/.github/workflows/swift-linux-build.yml @@ -5,7 +5,7 @@ on: push: branches: [ main ] pull_request: - branches: [ main ] + branches: [ main, next ] jobs: build-linux: @@ -42,4 +42,6 @@ jobs: - name: Run tests run: | - [ -d Tests ] && swift test --parallel + if [ -d Tests ]; then + swift test --parallel + fi diff --git a/.github/workflows/swift-macos-build.yml b/.github/workflows/swift-macos-build.yml index 6a26313..3ab5c76 100644 --- a/.github/workflows/swift-macos-build.yml +++ b/.github/workflows/swift-macos-build.yml @@ -5,7 +5,7 @@ on: push: branches: [ main ] pull_request: - branches: [ main ] + branches: [ main, next ] jobs: build-macos: diff --git a/.github/workflows/swift-sanitizer-address.yml b/.github/workflows/swift-sanitizer-address.yml index 0fa9418..a10e91d 100644 --- a/.github/workflows/swift-sanitizer-address.yml +++ b/.github/workflows/swift-sanitizer-address.yml @@ -5,7 +5,7 @@ on: push: branches: [ main ] pull_request: - branches: [ main ] + branches: [ main, next ] jobs: address-sanitizer: diff --git a/.github/workflows/swift-sanitizer-thread.yml b/.github/workflows/swift-sanitizer-thread.yml index 943994d..0c360f4 100644 --- a/.github/workflows/swift-sanitizer-thread.yml +++ b/.github/workflows/swift-sanitizer-thread.yml @@ -5,7 +5,7 @@ on: push: branches: [ main ] pull_request: - branches: [ main ] + branches: [ main, next ] jobs: thread-sanitizer: From 2daa1dddc9f85e875608fb8d63176d681d5bb0d5 Mon Sep 17 00:00:00 2001 From: ordo-ci Date: Wed, 29 Nov 2023 14:44:13 +0000 Subject: [PATCH 09/39] =?UTF-8?q?ci:=20=F0=9F=94=84=20synced=20local=20'.g?= =?UTF-8?q?ithub/workflows/'=20with=20remote=20'workflows/swift'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/swift-linux-build.yml | 3 +-- .github/workflows/swift-macos-build.yml | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/swift-linux-build.yml b/.github/workflows/swift-linux-build.yml index 94944bf..9412b3b 100644 --- a/.github/workflows/swift-linux-build.yml +++ b/.github/workflows/swift-linux-build.yml @@ -14,8 +14,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest] - swift: ["5.7", "5.8", "5.9"] - + swift: [ "5.9" ] runs-on: ${{ matrix.os }} diff --git a/.github/workflows/swift-macos-build.yml b/.github/workflows/swift-macos-build.yml index 3ab5c76..817bcfb 100644 --- a/.github/workflows/swift-macos-build.yml +++ b/.github/workflows/swift-macos-build.yml @@ -14,7 +14,7 @@ jobs: fail-fast: false matrix: os: [macos-13] - swift: ["5.7", "5.8", "5.9"] + swift: [ "5.9" ] runs-on: ${{ matrix.os }} From 8e1297883cac3550de93b83e1abb84bdea8bb3fa Mon Sep 17 00:00:00 2001 From: ordo-ci Date: Thu, 4 Jan 2024 08:16:10 +0000 Subject: [PATCH 10/39] =?UTF-8?q?ci:=20=F0=9F=94=84=20synced=20local=20'.g?= =?UTF-8?q?ithub/workflows/'=20with=20remote=20'workflows/swift'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/semantic-release.yml | 4 ++-- .github/workflows/swift-benchmark-delta.yml | 4 ++-- .github/workflows/swift-check-api-breaks.yml | 2 +- .github/workflows/swift-code-coverage.yml | 4 ++-- .github/workflows/swift-lint.yml | 2 +- .github/workflows/swift-linux-build.yml | 2 +- .github/workflows/swift-macos-build.yml | 2 +- .github/workflows/swift-outdated-dependencies.yml | 4 ++-- .github/workflows/swift-sanitizer-address.yml | 2 +- .github/workflows/swift-sanitizer-thread.yml | 2 +- 10 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/semantic-release.yml b/.github/workflows/semantic-release.yml index 85c763b..5870777 100644 --- a/.github/workflows/semantic-release.yml +++ b/.github/workflows/semantic-release.yml @@ -9,7 +9,7 @@ jobs: semantic-release: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 @@ -52,7 +52,7 @@ jobs: failTitle: false" > .releaserc.yml - name: Setup Node.js - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: '18' diff --git a/.github/workflows/swift-benchmark-delta.yml b/.github/workflows/swift-benchmark-delta.yml index 26c04af..690dbd9 100644 --- a/.github/workflows/swift-benchmark-delta.yml +++ b/.github/workflows/swift-benchmark-delta.yml @@ -17,7 +17,7 @@ jobs: os: [ubuntu-latest] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 @@ -80,7 +80,7 @@ jobs: echo 'EOF' >> $GITHUB_ENV - name: Comment PR if: ${{ env.hasBenchmark == '1' }} - uses: thollander/actions-comment-pull-request@v1 + uses: thollander/actions-comment-pull-request@v2 with: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} message: ${{ env.PRTEST }} diff --git a/.github/workflows/swift-check-api-breaks.yml b/.github/workflows/swift-check-api-breaks.yml index f14378e..40a20a9 100644 --- a/.github/workflows/swift-check-api-breaks.yml +++ b/.github/workflows/swift-check-api-breaks.yml @@ -12,7 +12,7 @@ jobs: timeout-minutes: 30 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 - name: Ubuntu deps diff --git a/.github/workflows/swift-code-coverage.yml b/.github/workflows/swift-code-coverage.yml index 706824e..a188430 100644 --- a/.github/workflows/swift-code-coverage.yml +++ b/.github/workflows/swift-code-coverage.yml @@ -11,7 +11,7 @@ jobs: runs-on: [ubuntu-22.04] timeout-minutes: 60 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Ubuntu deps if: ${{ runner.os == 'Linux' }} @@ -39,7 +39,7 @@ jobs: fi - name: Upload codecov - uses: codecov/codecov-action@v2 + uses: codecov/codecov-action@v3 with: token: ${{ secrets.CODECOV_REPO_TOKEN }} files: info.lcov diff --git a/.github/workflows/swift-lint.yml b/.github/workflows/swift-lint.yml index 210183b..331f74c 100644 --- a/.github/workflows/swift-lint.yml +++ b/.github/workflows/swift-lint.yml @@ -13,7 +13,7 @@ jobs: timeout-minutes: 60 runs-on: [ubuntu-latest] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: GitHub Action for SwiftLint with --strict uses: norio-nomura/action-swiftlint@3.2.1 with: diff --git a/.github/workflows/swift-linux-build.yml b/.github/workflows/swift-linux-build.yml index 9412b3b..df4ce37 100644 --- a/.github/workflows/swift-linux-build.yml +++ b/.github/workflows/swift-linux-build.yml @@ -23,7 +23,7 @@ jobs: with: swift-version: ${{ matrix.swift }} - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Start consul uses: ./.github/actions/consul-start diff --git a/.github/workflows/swift-macos-build.yml b/.github/workflows/swift-macos-build.yml index 817bcfb..231ae9f 100644 --- a/.github/workflows/swift-macos-build.yml +++ b/.github/workflows/swift-macos-build.yml @@ -30,7 +30,7 @@ jobs: echo BENCHMARK_DISABLE_JEMALLOC=true >> $GITHUB_ENV brew install jemalloc - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Start consul uses: ./.github/actions/consul-start diff --git a/.github/workflows/swift-outdated-dependencies.yml b/.github/workflows/swift-outdated-dependencies.yml index 8d45ba5..2da807b 100644 --- a/.github/workflows/swift-outdated-dependencies.yml +++ b/.github/workflows/swift-outdated-dependencies.yml @@ -10,10 +10,10 @@ jobs: runs-on: [ubuntu-latest] timeout-minutes: 60 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Check Swift package dependencies id: spm-dep-check - uses: MarcoEidinger/swift-package-dependencies-check@2.3.4 + uses: MarcoEidinger/swift-package-dependencies-check@2.5.0 with: isMutating: true failWhenOutdated: false diff --git a/.github/workflows/swift-sanitizer-address.yml b/.github/workflows/swift-sanitizer-address.yml index a10e91d..c4ed570 100644 --- a/.github/workflows/swift-sanitizer-address.yml +++ b/.github/workflows/swift-sanitizer-address.yml @@ -29,7 +29,7 @@ jobs: run: | sudo apt-get install -y libjemalloc-dev - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Start consul uses: ./.github/actions/consul-start diff --git a/.github/workflows/swift-sanitizer-thread.yml b/.github/workflows/swift-sanitizer-thread.yml index 0c360f4..932fba9 100644 --- a/.github/workflows/swift-sanitizer-thread.yml +++ b/.github/workflows/swift-sanitizer-thread.yml @@ -30,7 +30,7 @@ jobs: sudo apt-get install -y libjemalloc-dev echo BENCHMARK_DISABLE_JEMALLOC=true >> $GITHUB_ENV - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Start consul uses: ./.github/actions/consul-start From e0ea4b03a374bd05db151da749d517d88c3d9793 Mon Sep 17 00:00:00 2001 From: ordo-ci Date: Thu, 4 Jan 2024 09:09:44 +0000 Subject: [PATCH 11/39] =?UTF-8?q?ci:=20=F0=9F=94=84=20synced=20local=20'.g?= =?UTF-8?q?ithub/workflows/'=20with=20remote=20'workflows/swift'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/swift-benchmark-delta.yml | 7 ++++--- .github/workflows/swift-linux-build.yml | 1 + .github/workflows/swift-macos-build.yml | 5 ++++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/workflows/swift-benchmark-delta.yml b/.github/workflows/swift-benchmark-delta.yml index 690dbd9..dac7554 100644 --- a/.github/workflows/swift-benchmark-delta.yml +++ b/.github/workflows/swift-benchmark-delta.yml @@ -40,11 +40,12 @@ jobs: #git config --global url."https://ordo-ci:${{ secrets.CI_MACHINE_PAT }}@github.com".insteadOf "https://github.com" #/usr/bin/ordo-performance [ -d Benchmarks ] && echo "hasBenchmark=1" >> $GITHUB_ENV + [ -f Benchmarks/Package.swift ] && echo "BENCHMARK_PACKAGE_PATH=--package-path Benchmarks" >> $GITHUB_ENV echo "/opt/homebrew/bin:/usr/local/bin" >> $GITHUB_PATH - name: Run benchmarks for PR branch if: ${{ env.hasBenchmark == '1' }} run: | - swift package --allow-writing-to-directory .benchmarkBaselines/ benchmark baseline update pull_request --no-progress --quiet + swift package ${BENCHMARK_PACKAGE_PATH} --allow-writing-to-directory .benchmarkBaselines/ benchmark baseline update pull_request --no-progress --quiet - name: Switch to branch 'main' if: ${{ env.hasBenchmark == '1' }} run: | @@ -53,14 +54,14 @@ jobs: - name: Run benchmarks for branch 'main' if: ${{ env.hasBenchmark == '1' }} run: | - swift package --allow-writing-to-directory .benchmarkBaselines/ benchmark baseline update main --no-progress --quiet + swift package ${BENCHMARK_PACKAGE_PATH} --allow-writing-to-directory .benchmarkBaselines/ benchmark baseline update main --no-progress --quiet - name: Compare PR and main if: ${{ env.hasBenchmark == '1' }} id: benchmark run: | echo $(date) >> $GITHUB_STEP_SUMMARY echo "exitStatus=1" >> $GITHUB_ENV - swift package benchmark baseline check main pull_request --format markdown >> $GITHUB_STEP_SUMMARY + swift package ${BENCHMARK_PACKAGE_PATH} benchmark baseline check main pull_request --format markdown >> $GITHUB_STEP_SUMMARY echo "exitStatus=0" >> $GITHUB_ENV continue-on-error: true - if: ${{ env.exitStatus == '0' }} diff --git a/.github/workflows/swift-linux-build.yml b/.github/workflows/swift-linux-build.yml index df4ce37..07085ec 100644 --- a/.github/workflows/swift-linux-build.yml +++ b/.github/workflows/swift-linux-build.yml @@ -20,6 +20,7 @@ jobs: steps: - uses: fwal/setup-swift@v1 + if: ${{ false }} with: swift-version: ${{ matrix.swift }} diff --git a/.github/workflows/swift-macos-build.yml b/.github/workflows/swift-macos-build.yml index 231ae9f..394a52d 100644 --- a/.github/workflows/swift-macos-build.yml +++ b/.github/workflows/swift-macos-build.yml @@ -13,13 +13,16 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-13] + os: [macos-13-xlarge] swift: [ "5.9" ] runs-on: ${{ matrix.os }} + env: + DEVELOPER_DIR: /Applications/Xcode_15.1.0.app/Contents/Developer steps: - uses: fwal/setup-swift@v1 + if: ${{ false }} with: swift-version: ${{ matrix.swift }} From be87bdf73b902929172dcaad094558c55a5e28e8 Mon Sep 17 00:00:00 2001 From: ordo-ci Date: Wed, 10 Jan 2024 07:35:55 +0000 Subject: [PATCH 12/39] =?UTF-8?q?ci:=20=F0=9F=94=84=20synced=20local=20'.g?= =?UTF-8?q?ithub/workflows/'=20with=20remote=20'workflows/swift'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/swift-benchmark-delta.yml | 57 ++++++++++++--------- .github/workflows/swift-macos-build.yml | 2 +- 2 files changed, 34 insertions(+), 25 deletions(-) diff --git a/.github/workflows/swift-benchmark-delta.yml b/.github/workflows/swift-benchmark-delta.yml index dac7554..31bc5e9 100644 --- a/.github/workflows/swift-benchmark-delta.yml +++ b/.github/workflows/swift-benchmark-delta.yml @@ -7,45 +7,41 @@ on: jobs: benchmark-delta: - + timeout-minutes: 30 runs-on: ${{ matrix.os }} - continue-on-error: true strategy: matrix: - #os: [[Linux, benchmark-swift-latest, self-hosted]] os: [ubuntu-latest] steps: - uses: actions/checkout@v4 with: fetch-depth: 0 - - name: Homebrew Mac if: ${{ runner.os == 'Macos' }} run: | echo "/opt/homebrew/bin:/usr/local/bin" >> $GITHUB_PATH brew install jemalloc - - name: Ubuntu deps if: ${{ runner.os == 'Linux' }} run: | sudo apt-get install -y libjemalloc-dev - - name: Start consul uses: ./.github/actions/consul-start - - name: Git URL token override and misc run: | #git config --global url."https://ordo-ci:${{ secrets.CI_MACHINE_PAT }}@github.com".insteadOf "https://github.com" #/usr/bin/ordo-performance [ -d Benchmarks ] && echo "hasBenchmark=1" >> $GITHUB_ENV [ -f Benchmarks/Package.swift ] && echo "BENCHMARK_PACKAGE_PATH=--package-path Benchmarks" >> $GITHUB_ENV + echo "BENCHMARK_RUN_URL=https://github.com/ordo-one/${{ github.event.repository.name }}/actions/runs/${{ github.run_id }}" >> $GITHUB_ENV echo "/opt/homebrew/bin:/usr/local/bin" >> $GITHUB_PATH - name: Run benchmarks for PR branch if: ${{ env.hasBenchmark == '1' }} run: | - swift package ${BENCHMARK_PACKAGE_PATH} --allow-writing-to-directory .benchmarkBaselines/ benchmark baseline update pull_request --no-progress --quiet + echo "exitStatus=1" >> $GITHUB_ENV + swift package ${BENCHMARK_PACKAGE_PATH} --disable-sandbox benchmark baseline update pull_request --no-progress - name: Switch to branch 'main' if: ${{ env.hasBenchmark == '1' }} run: | @@ -54,39 +50,52 @@ jobs: - name: Run benchmarks for branch 'main' if: ${{ env.hasBenchmark == '1' }} run: | - swift package ${BENCHMARK_PACKAGE_PATH} --allow-writing-to-directory .benchmarkBaselines/ benchmark baseline update main --no-progress --quiet + swift package ${BENCHMARK_PACKAGE_PATH} --disable-sandbox benchmark baseline update main --no-progress - name: Compare PR and main if: ${{ env.hasBenchmark == '1' }} id: benchmark + continue-on-error: true run: | echo $(date) >> $GITHUB_STEP_SUMMARY - echo "exitStatus=1" >> $GITHUB_ENV swift package ${BENCHMARK_PACKAGE_PATH} benchmark baseline check main pull_request --format markdown >> $GITHUB_STEP_SUMMARY - echo "exitStatus=0" >> $GITHUB_ENV - continue-on-error: true + echo "exitStatus=$?" >> $GITHUB_ENV - if: ${{ env.exitStatus == '0' }} - name: Pull request comment text success - id: prtestsuccess + name: Pull request comment text same run: | - echo 'PRTEST<> $GITHUB_ENV - echo "[Pull request benchmark comparison [${{ matrix.os }}] with 'main' run at $(date -Iseconds)](https://github.com/ordo-one/${{ github.event.repository.name }}/actions/runs/${{ github.run_id }})" >> $GITHUB_ENV - echo 'EOF' >> $GITHUB_ENV + { + echo "_Pull request is the same as baseline_" + echo "[Pull request benchmark comparison [${{ matrix.os }}] with 'main' run at $(date -Iseconds)]($BENCHMARK_RUN_URL)" + } > benchmark_comment - if: ${{ env.exitStatus == '1' }} name: Pull request comment text failure - id: prtestfailure run: | - echo 'PRTEST<> $GITHUB_ENV - echo "[Pull request benchmark comparison [${{ matrix.os }}] with 'main' run at $(date -Iseconds)](https://github.com/ordo-one/${{ github.event.repository.name }}/actions/runs/${{ github.run_id }})" >> $GITHUB_ENV - echo "_Pull request had performance regressions_" >> $GITHUB_ENV - echo 'EOF' >> $GITHUB_ENV + { + echo "_Pull request had an unknown failure_" + echo "[Pull request benchmark comparison [${{ matrix.os }}] with 'main' run at $(date -Iseconds)]($BENCHMARK_RUN_URL)" + } > benchmark_comment + - if: ${{ env.exitStatus == '2' }} + name: Pull request comment text regression + run: | + { + echo "_Pull request had a regression_" + echo "[Pull request benchmark comparison [${{ matrix.os }}] with 'main' run at $(date -Iseconds)]($BENCHMARK_RUN_URL)" + } > benchmark_comment + - if: ${{ env.exitStatus == '4' }} + name: Pull request comment text improvement + run: | + { + echo "_Pull request had a performance improvement_" + echo "[Pull request benchmark comparison [${{ matrix.os }}] with 'main' run at $(date -Iseconds)]($BENCHMARK_RUN_URL)" + } > benchmark_comment - name: Comment PR if: ${{ env.hasBenchmark == '1' }} uses: thollander/actions-comment-pull-request@v2 with: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - message: ${{ env.PRTEST }} - comment_includes: "Pull request benchmark comparison [${{ matrix.os }}] with" + filePath: benchmark_comment + comment_tag: 'Pull request benchmark comparison [${{ matrix.os }}] with' - name: Exit with correct status + if: ${{ success() || failure() }} run: | #/usr/bin/ordo-performance powersave exit ${{ env.exitStatus }} diff --git a/.github/workflows/swift-macos-build.yml b/.github/workflows/swift-macos-build.yml index 394a52d..ed435f4 100644 --- a/.github/workflows/swift-macos-build.yml +++ b/.github/workflows/swift-macos-build.yml @@ -13,7 +13,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-13-xlarge] + os: [macos-13] swift: [ "5.9" ] runs-on: ${{ matrix.os }} From 9f1cb7a4fcb23fd8da560358c2755e4d35f8177b Mon Sep 17 00:00:00 2001 From: ordo-ci Date: Wed, 10 Jan 2024 07:35:55 +0000 Subject: [PATCH 13/39] =?UTF-8?q?ci:=20=F0=9F=94=84=20synced=20local=20'.s?= =?UTF-8?q?wiftlint.yml'=20with=20remote=20'dotfiles/swiftlint.yml'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .swiftlint.yml | 95 ++------------------------------------------------ 1 file changed, 2 insertions(+), 93 deletions(-) diff --git a/.swiftlint.yml b/.swiftlint.yml index 347c8e5..b71da5a 100644 --- a/.swiftlint.yml +++ b/.swiftlint.yml @@ -1,93 +1,2 @@ -#################################################################### -# DO NOT EDIT THIS FILE -# This is a master file maintained in https://github.com/ordo-one/public-repository-templates -# -# Add overrides into `swiftlint_refinement.yml` in the directory it self or -# .swiftlint.yml under the specific directory where the code is located -# -# Documentation is under https://github.com/realm/SwiftLint -#################################################################### - -included: - - Benchmarks - - Sources - - Tests -excluded: -analyzer_rules: - - unused_import -opt_in_rules: - - array_init - - attributes - - closure_end_indentation - - closure_spacing - - collection_alignment - - contains_over_filter_count - - contains_over_filter_is_empty - - contains_over_first_not_nil - - contains_over_range_nil_comparison - - discouraged_none_name - - discouraged_object_literal - - empty_collection_literal - - empty_count - - empty_string - - empty_xctest_method - - enum_case_associated_values_count - - explicit_init - - extension_access_modifier - - fallthrough - - fatal_error_message - - file_name - - first_where - - flatmap_over_map_reduce - - identical_operands - - joined_default_parameter - - last_where - - legacy_multiple - - literal_expression_end_indentation - - lower_acl_than_parent - - modifier_order - - nimble_operator - - nslocalizedstring_key - - number_separator - - object_literal - - operator_usage_whitespace - - overridden_super_call - - override_in_extension - - pattern_matching_keywords - - prefer_self_in_static_references - - prefer_self_type_over_type_of_self - - private_action - - private_outlet - - prohibited_interface_builder - - prohibited_super_call - - quick_discouraged_call - - quick_discouraged_focused_test - - quick_discouraged_pending_test - - reduce_into - - redundant_nil_coalescing - - redundant_type_annotation - - single_test_class - - sorted_first_last - - sorted_imports - - static_operator - - strong_iboutlet - - test_case_accessibility - - toggle_bool - - unavailable_function - - unneeded_parentheses_in_closure_argument - - unowned_variable_capture - - untyped_error_in_catch - - vertical_parameter_alignment_on_call - - vertical_whitespace_closing_braces - - vertical_whitespace_opening_braces - - xct_specific_matcher - - yoda_condition -line_length: - warning: 140 - error: 140 - ignores_comments: true - ignores_urls: true - ignores_function_declarations: true - ignores_interpolated_strings: true -identifier_name: - excluded: [id, i, j, k] +child_config: .swiftlint_refinement.yml +parent_config: .swiftlint_base.yml From 2ed9742cde7b95f30d98347a2f288b805bda6d88 Mon Sep 17 00:00:00 2001 From: ordo-ci Date: Wed, 10 Jan 2024 07:35:55 +0000 Subject: [PATCH 14/39] =?UTF-8?q?ci:=20=F0=9F=94=84=20created=20local=20'.?= =?UTF-8?q?swiftlint=5Fbase.yml'=20from=20remote=20'dotfiles/swiftlint=5Fb?= =?UTF-8?q?ase.yml'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .swiftlint_base.yml | 93 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 93 insertions(+) create mode 100644 .swiftlint_base.yml diff --git a/.swiftlint_base.yml b/.swiftlint_base.yml new file mode 100644 index 0000000..347c8e5 --- /dev/null +++ b/.swiftlint_base.yml @@ -0,0 +1,93 @@ +#################################################################### +# DO NOT EDIT THIS FILE +# This is a master file maintained in https://github.com/ordo-one/public-repository-templates +# +# Add overrides into `swiftlint_refinement.yml` in the directory it self or +# .swiftlint.yml under the specific directory where the code is located +# +# Documentation is under https://github.com/realm/SwiftLint +#################################################################### + +included: + - Benchmarks + - Sources + - Tests +excluded: +analyzer_rules: + - unused_import +opt_in_rules: + - array_init + - attributes + - closure_end_indentation + - closure_spacing + - collection_alignment + - contains_over_filter_count + - contains_over_filter_is_empty + - contains_over_first_not_nil + - contains_over_range_nil_comparison + - discouraged_none_name + - discouraged_object_literal + - empty_collection_literal + - empty_count + - empty_string + - empty_xctest_method + - enum_case_associated_values_count + - explicit_init + - extension_access_modifier + - fallthrough + - fatal_error_message + - file_name + - first_where + - flatmap_over_map_reduce + - identical_operands + - joined_default_parameter + - last_where + - legacy_multiple + - literal_expression_end_indentation + - lower_acl_than_parent + - modifier_order + - nimble_operator + - nslocalizedstring_key + - number_separator + - object_literal + - operator_usage_whitespace + - overridden_super_call + - override_in_extension + - pattern_matching_keywords + - prefer_self_in_static_references + - prefer_self_type_over_type_of_self + - private_action + - private_outlet + - prohibited_interface_builder + - prohibited_super_call + - quick_discouraged_call + - quick_discouraged_focused_test + - quick_discouraged_pending_test + - reduce_into + - redundant_nil_coalescing + - redundant_type_annotation + - single_test_class + - sorted_first_last + - sorted_imports + - static_operator + - strong_iboutlet + - test_case_accessibility + - toggle_bool + - unavailable_function + - unneeded_parentheses_in_closure_argument + - unowned_variable_capture + - untyped_error_in_catch + - vertical_parameter_alignment_on_call + - vertical_whitespace_closing_braces + - vertical_whitespace_opening_braces + - xct_specific_matcher + - yoda_condition +line_length: + warning: 140 + error: 140 + ignores_comments: true + ignores_urls: true + ignores_function_declarations: true + ignores_interpolated_strings: true +identifier_name: + excluded: [id, i, j, k] From 9ff66275f5dc5909a57ee4f3adf018b2278da1d4 Mon Sep 17 00:00:00 2001 From: ordo-ci Date: Wed, 10 Jan 2024 07:35:55 +0000 Subject: [PATCH 15/39] =?UTF-8?q?ci:=20=F0=9F=94=84=20created=20local=20'.?= =?UTF-8?q?swiftlint=5Frefinement.yml'=20from=20remote=20'dotfiles/swiftli?= =?UTF-8?q?nt=5Frefinement.yml'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .swiftlint_refinement.yml | 1 + 1 file changed, 1 insertion(+) create mode 100644 .swiftlint_refinement.yml diff --git a/.swiftlint_refinement.yml b/.swiftlint_refinement.yml new file mode 100644 index 0000000..65ed8fb --- /dev/null +++ b/.swiftlint_refinement.yml @@ -0,0 +1 @@ +excluded: From 6e9f6da4bec86af374dcebbdbfa92a6009753a82 Mon Sep 17 00:00:00 2001 From: ordo-ci Date: Wed, 24 Jan 2024 06:22:27 +0000 Subject: [PATCH 16/39] =?UTF-8?q?ci:=20=F0=9F=94=84=20synced=20local=20'.g?= =?UTF-8?q?ithub/workflows/'=20with=20remote=20'workflows/swift'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/semantic-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/semantic-release.yml b/.github/workflows/semantic-release.yml index 5870777..a4c3e0f 100644 --- a/.github/workflows/semantic-release.yml +++ b/.github/workflows/semantic-release.yml @@ -54,7 +54,7 @@ jobs: - name: Setup Node.js uses: actions/setup-node@v4 with: - node-version: '18' + node-version: '20' - name: Install semantic-release run: | From b1a007fe039b7beef6ca7de8bc84e43ee33945b8 Mon Sep 17 00:00:00 2001 From: ordo-ci Date: Tue, 20 Feb 2024 19:53:21 +0200 Subject: [PATCH 17/39] =?UTF-8?q?ci:=20=F0=9F=94=84=20synced=20local=20'.g?= =?UTF-8?q?ithub/workflows/'=20with=20remote=20'workflows/swift'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/swift-outdated-dependencies.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/swift-outdated-dependencies.yml b/.github/workflows/swift-outdated-dependencies.yml index 2da807b..bad50b8 100644 --- a/.github/workflows/swift-outdated-dependencies.yml +++ b/.github/workflows/swift-outdated-dependencies.yml @@ -19,7 +19,7 @@ jobs: failWhenOutdated: false - name: Create Pull Request if: steps.spm-dep-check.outputs.outdatedDependencies == 'true' - uses: peter-evans/create-pull-request@v3 + uses: peter-evans/create-pull-request@v6 with: commit-message: 'chore: update package dependencies' branch: updatePackageDepedencies From 5286190ac4f64c3b5ec2e09824d6995db54b4dea Mon Sep 17 00:00:00 2001 From: ordo-ci Date: Wed, 21 Feb 2024 15:50:09 +0000 Subject: [PATCH 18/39] =?UTF-8?q?ci:=20=F0=9F=94=84=20synced=20local=20'.g?= =?UTF-8?q?ithub/workflows/'=20with=20remote=20'workflows/swift'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/swift-code-coverage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/swift-code-coverage.yml b/.github/workflows/swift-code-coverage.yml index a188430..67d56a4 100644 --- a/.github/workflows/swift-code-coverage.yml +++ b/.github/workflows/swift-code-coverage.yml @@ -39,7 +39,7 @@ jobs: fi - name: Upload codecov - uses: codecov/codecov-action@v3 + uses: codecov/codecov-action@v4 with: token: ${{ secrets.CODECOV_REPO_TOKEN }} files: info.lcov From 070348a5536144c042f999255841787a2f19000d Mon Sep 17 00:00:00 2001 From: ordo-ci Date: Thu, 7 Mar 2024 10:29:58 +0200 Subject: [PATCH 19/39] =?UTF-8?q?ci:=20=F0=9F=94=84=20synced=20local=20'.g?= =?UTF-8?q?ithub/workflows/'=20with=20remote=20'workflows/swift'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/swift-macos-build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/swift-macos-build.yml b/.github/workflows/swift-macos-build.yml index ed435f4..58c2f5e 100644 --- a/.github/workflows/swift-macos-build.yml +++ b/.github/workflows/swift-macos-build.yml @@ -13,12 +13,12 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-13] + os: [macos-14] swift: [ "5.9" ] runs-on: ${{ matrix.os }} env: - DEVELOPER_DIR: /Applications/Xcode_15.1.0.app/Contents/Developer + DEVELOPER_DIR: /Applications/Xcode_15.2.0.app/Contents/Developer steps: - uses: fwal/setup-swift@v1 From 663c7135acaef4bfd6e184e103b4f6115ba70afb Mon Sep 17 00:00:00 2001 From: ordo-ci Date: Mon, 25 Mar 2024 13:25:14 +0200 Subject: [PATCH 20/39] =?UTF-8?q?ci:=20=F0=9F=94=84=20synced=20local=20'.g?= =?UTF-8?q?ithub/workflows/'=20with=20remote=20'workflows/swift'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/swift-linux-build.yml | 4 ++-- .github/workflows/swift-macos-build.yml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/swift-linux-build.yml b/.github/workflows/swift-linux-build.yml index 07085ec..35a0b4f 100644 --- a/.github/workflows/swift-linux-build.yml +++ b/.github/workflows/swift-linux-build.yml @@ -14,12 +14,12 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest] - swift: [ "5.9" ] + swift: [ "5.10" ] runs-on: ${{ matrix.os }} steps: - - uses: fwal/setup-swift@v1 + - uses: swift-actions/setup-swift@v2 if: ${{ false }} with: swift-version: ${{ matrix.swift }} diff --git a/.github/workflows/swift-macos-build.yml b/.github/workflows/swift-macos-build.yml index 58c2f5e..76a468b 100644 --- a/.github/workflows/swift-macos-build.yml +++ b/.github/workflows/swift-macos-build.yml @@ -14,14 +14,14 @@ jobs: fail-fast: false matrix: os: [macos-14] - swift: [ "5.9" ] + swift: [ "5.10" ] runs-on: ${{ matrix.os }} env: - DEVELOPER_DIR: /Applications/Xcode_15.2.0.app/Contents/Developer + DEVELOPER_DIR: /Applications/Xcode_15.3.app/Contents/Developer steps: - - uses: fwal/setup-swift@v1 + - uses: swift-actions/setup-swift@v2 if: ${{ false }} with: swift-version: ${{ matrix.swift }} From 77d63a9243cc48f4c1f47d1dbd2cc4dc20855912 Mon Sep 17 00:00:00 2001 From: ordo-ci Date: Wed, 22 May 2024 11:28:48 +0300 Subject: [PATCH 21/39] =?UTF-8?q?ci:=20=F0=9F=94=84=20synced=20local=20'.g?= =?UTF-8?q?ithub/workflows/'=20with=20remote=20'workflows/swift'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/semantic-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/semantic-release.yml b/.github/workflows/semantic-release.yml index a4c3e0f..8bcfe5d 100644 --- a/.github/workflows/semantic-release.yml +++ b/.github/workflows/semantic-release.yml @@ -58,7 +58,7 @@ jobs: - name: Install semantic-release run: | - npm install semantic-release conventional-changelog-conventionalcommits -D + npm install semantic-release conventional-changelog-conventionalcommits@v7 -D npm list - name: Release env: From a4e22e4594163349ba671eebe83aaa65061e1fbf Mon Sep 17 00:00:00 2001 From: ordo-ci Date: Tue, 11 Jun 2024 14:05:25 +0300 Subject: [PATCH 22/39] =?UTF-8?q?ci:=20=F0=9F=94=84=20synced=20local=20'.g?= =?UTF-8?q?ithub/workflows/'=20with=20remote=20'workflows/swift'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/semantic-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/semantic-release.yml b/.github/workflows/semantic-release.yml index 8bcfe5d..6050415 100644 --- a/.github/workflows/semantic-release.yml +++ b/.github/workflows/semantic-release.yml @@ -58,7 +58,7 @@ jobs: - name: Install semantic-release run: | - npm install semantic-release conventional-changelog-conventionalcommits@v7 -D + npm install semantic-release@v24 conventional-changelog-conventionalcommits@v8 -D npm list - name: Release env: From a8aa3a43936d640e69a2240665e1051abdcfa14a Mon Sep 17 00:00:00 2001 From: ordo-ci Date: Tue, 23 Jul 2024 14:46:45 +0000 Subject: [PATCH 23/39] =?UTF-8?q?ci:=20=F0=9F=94=84=20synced=20local=20'.g?= =?UTF-8?q?ithub/workflows/'=20with=20remote=20'workflows/swift'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/swift-macos-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/swift-macos-build.yml b/.github/workflows/swift-macos-build.yml index 76a468b..8991391 100644 --- a/.github/workflows/swift-macos-build.yml +++ b/.github/workflows/swift-macos-build.yml @@ -18,7 +18,7 @@ jobs: runs-on: ${{ matrix.os }} env: - DEVELOPER_DIR: /Applications/Xcode_15.3.app/Contents/Developer + DEVELOPER_DIR: /Applications/Xcode_15.4.app/Contents/Developer steps: - uses: swift-actions/setup-swift@v2 From 2f5a7ae11f9bd98d479607e21a45960de56ea3d6 Mon Sep 17 00:00:00 2001 From: ordo-ci Date: Wed, 24 Jul 2024 11:57:55 +0000 Subject: [PATCH 24/39] =?UTF-8?q?ci:=20=F0=9F=94=84=20synced=20local=20'.g?= =?UTF-8?q?ithub/workflows/'=20with=20remote=20'workflows/swift'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/swift-macos-build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/swift-macos-build.yml b/.github/workflows/swift-macos-build.yml index 8991391..b843b99 100644 --- a/.github/workflows/swift-macos-build.yml +++ b/.github/workflows/swift-macos-build.yml @@ -38,6 +38,8 @@ jobs: - name: Start consul uses: ./.github/actions/consul-start + - name: GH auth + run: echo "machine api.github.com login ${HOMEBREW_GITHUB_API_TOKEN} password x-oauth-basic" > $HOME/.netrc - name: Swift version run: swift --version - name: Build From 5742a049909c448fd5f3057eef975c91ef9b0a9e Mon Sep 17 00:00:00 2001 From: ordo-ci Date: Thu, 25 Jul 2024 11:45:09 +0000 Subject: [PATCH 25/39] =?UTF-8?q?ci:=20=F0=9F=94=84=20synced=20local=20'.g?= =?UTF-8?q?ithub/workflows/'=20with=20remote=20'workflows/swift'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/swift-macos-build.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/swift-macos-build.yml b/.github/workflows/swift-macos-build.yml index b843b99..62f5f33 100644 --- a/.github/workflows/swift-macos-build.yml +++ b/.github/workflows/swift-macos-build.yml @@ -39,7 +39,9 @@ jobs: uses: ./.github/actions/consul-start - name: GH auth - run: echo "machine api.github.com login ${HOMEBREW_GITHUB_API_TOKEN} password x-oauth-basic" > $HOME/.netrc + run: | + echo "machine api.github.com login ${{ secrets.GITHUB_TOKEN }} password x-oauth-basic" > $HOME/.netrc + cat ~/.netrc - name: Swift version run: swift --version - name: Build From 15807b91cd2a2db6e0a8e99217278d040e0a5768 Mon Sep 17 00:00:00 2001 From: ordo-ci Date: Tue, 1 Oct 2024 09:40:58 +0000 Subject: [PATCH 26/39] =?UTF-8?q?ci:=20=F0=9F=94=84=20synced=20local=20'.g?= =?UTF-8?q?ithub/workflows/'=20with=20remote=20'workflows/swift'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/swift-sanitizer-address.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/swift-sanitizer-address.yml b/.github/workflows/swift-sanitizer-address.yml index c4ed570..65ffeec 100644 --- a/.github/workflows/swift-sanitizer-address.yml +++ b/.github/workflows/swift-sanitizer-address.yml @@ -12,7 +12,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest] + os: [macos-14] runs-on: ${{ matrix.os }} timeout-minutes: 60 From 86a770900dbeff0765a2e223c84762ac8cf24ad1 Mon Sep 17 00:00:00 2001 From: ordo-ci Date: Wed, 2 Oct 2024 07:48:35 +0000 Subject: [PATCH 27/39] =?UTF-8?q?ci:=20=F0=9F=94=84=20synced=20local=20'.g?= =?UTF-8?q?ithub/workflows/'=20with=20remote=20'workflows/swift'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/swift-macos-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/swift-macos-build.yml b/.github/workflows/swift-macos-build.yml index 62f5f33..05fb96e 100644 --- a/.github/workflows/swift-macos-build.yml +++ b/.github/workflows/swift-macos-build.yml @@ -1,4 +1,4 @@ -name: Swift macOS build +name: macOS build on: workflow_dispatch: From 5446e2b80ac442eb454d395a006f478168279dd3 Mon Sep 17 00:00:00 2001 From: ordo-ci Date: Wed, 2 Oct 2024 07:48:49 +0000 Subject: [PATCH 28/39] =?UTF-8?q?ci:=20=F0=9F=94=84=20synced=20local=20'.g?= =?UTF-8?q?ithub/workflows/'=20with=20remote=20'workflows/swift'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/swift-linux-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/swift-linux-build.yml b/.github/workflows/swift-linux-build.yml index 35a0b4f..3f027f8 100644 --- a/.github/workflows/swift-linux-build.yml +++ b/.github/workflows/swift-linux-build.yml @@ -1,4 +1,4 @@ -name: Swift Linux build +name: Linux build on: workflow_dispatch: From c69b0329dc8e0c9e5a21da65fce85c9243e7181b Mon Sep 17 00:00:00 2001 From: ordo-ci Date: Mon, 14 Oct 2024 06:54:55 +0000 Subject: [PATCH 29/39] =?UTF-8?q?ci:=20=F0=9F=94=84=20synced=20local=20'.g?= =?UTF-8?q?ithub/workflows/'=20with=20remote=20'workflows/swift'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/swift-code-coverage.yml | 9 +++++++-- .github/workflows/swift-linux-build.yml | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/swift-code-coverage.yml b/.github/workflows/swift-code-coverage.yml index 67d56a4..1ccb79f 100644 --- a/.github/workflows/swift-code-coverage.yml +++ b/.github/workflows/swift-code-coverage.yml @@ -16,7 +16,12 @@ jobs: - name: Ubuntu deps if: ${{ runner.os == 'Linux' }} run: | - sudo apt-get install -y libjemalloc-dev llvm-15 + sudo apt-get install -y libjemalloc-dev + + - uses: khlopko/setup-swift@bfd61cbd14eeef55a27afc45138b61ced7174839 + + - name: Swift version + run: swift --version - name: Start consul uses: ./.github/actions/consul-start @@ -41,6 +46,6 @@ jobs: - name: Upload codecov uses: codecov/codecov-action@v4 with: - token: ${{ secrets.CODECOV_REPO_TOKEN }} + token: ${{ secrets.CODECOV_REPO_TOKEN }} files: info.lcov fail_ci_if_error: true diff --git a/.github/workflows/swift-linux-build.yml b/.github/workflows/swift-linux-build.yml index 3f027f8..62b038f 100644 --- a/.github/workflows/swift-linux-build.yml +++ b/.github/workflows/swift-linux-build.yml @@ -14,7 +14,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest] - swift: [ "5.10" ] + swift: [ "5.10", "6.0" ] runs-on: ${{ matrix.os }} From 9d66f85674a8b669c485aeb1690030f9bb58d2ba Mon Sep 17 00:00:00 2001 From: ordo-ci Date: Mon, 14 Oct 2024 06:56:19 +0000 Subject: [PATCH 30/39] =?UTF-8?q?ci:=20=F0=9F=94=84=20synced=20local=20'.g?= =?UTF-8?q?ithub/workflows/'=20with=20remote=20'workflows/swift'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/swift-code-coverage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/swift-code-coverage.yml b/.github/workflows/swift-code-coverage.yml index 1ccb79f..6fad12f 100644 --- a/.github/workflows/swift-code-coverage.yml +++ b/.github/workflows/swift-code-coverage.yml @@ -40,7 +40,7 @@ jobs: fi if [ -f ${xctest_binary} ]; then - llvm-cov-15 export -format="lcov" ${xctest_binary} -instr-profile .build/debug/codecov/default.profdata > info.lcov + llvm-cov export -format="lcov" ${xctest_binary} -instr-profile .build/debug/codecov/default.profdata > info.lcov fi - name: Upload codecov From 6a34372202740f00679e9cd3c9cf4e5efe2b04ae Mon Sep 17 00:00:00 2001 From: ordo-ci Date: Thu, 7 Nov 2024 09:56:38 +0000 Subject: [PATCH 31/39] =?UTF-8?q?ci:=20=F0=9F=94=84=20synced=20local=20'.g?= =?UTF-8?q?ithub/workflows/'=20with=20remote=20'workflows/swift'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/swift-benchmark-delta.yml | 8 ++++---- .github/workflows/swift-macos-build.yml | 8 ++++---- .github/workflows/swift-outdated-dependencies.yml | 2 +- .github/workflows/swift-sanitizer-address.yml | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/swift-benchmark-delta.yml b/.github/workflows/swift-benchmark-delta.yml index 31bc5e9..b840196 100644 --- a/.github/workflows/swift-benchmark-delta.yml +++ b/.github/workflows/swift-benchmark-delta.yml @@ -89,11 +89,11 @@ jobs: } > benchmark_comment - name: Comment PR if: ${{ env.hasBenchmark == '1' }} - uses: thollander/actions-comment-pull-request@v2 + uses: thollander/actions-comment-pull-request@v3 with: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - filePath: benchmark_comment - comment_tag: 'Pull request benchmark comparison [${{ matrix.os }}] with' + github-token: ${{ secrets.GITHUB_TOKEN }} + file-path: benchmark_comment + comment-tag: 'Pull request benchmark comparison [${{ matrix.os }}] with' - name: Exit with correct status if: ${{ success() || failure() }} run: | diff --git a/.github/workflows/swift-macos-build.yml b/.github/workflows/swift-macos-build.yml index 05fb96e..c140c86 100644 --- a/.github/workflows/swift-macos-build.yml +++ b/.github/workflows/swift-macos-build.yml @@ -13,12 +13,12 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-14] - swift: [ "5.10" ] + os: [macos-15] + swift: [ "5.10", "6.0" ] runs-on: ${{ matrix.os }} - env: - DEVELOPER_DIR: /Applications/Xcode_15.4.app/Contents/Developer +# env: +# DEVELOPER_DIR: /Applications/Xcode_16.1.app/Contents/Developer steps: - uses: swift-actions/setup-swift@v2 diff --git a/.github/workflows/swift-outdated-dependencies.yml b/.github/workflows/swift-outdated-dependencies.yml index bad50b8..8ed989e 100644 --- a/.github/workflows/swift-outdated-dependencies.yml +++ b/.github/workflows/swift-outdated-dependencies.yml @@ -19,7 +19,7 @@ jobs: failWhenOutdated: false - name: Create Pull Request if: steps.spm-dep-check.outputs.outdatedDependencies == 'true' - uses: peter-evans/create-pull-request@v6 + uses: peter-evans/create-pull-request@v7 with: commit-message: 'chore: update package dependencies' branch: updatePackageDepedencies diff --git a/.github/workflows/swift-sanitizer-address.yml b/.github/workflows/swift-sanitizer-address.yml index 65ffeec..f811bce 100644 --- a/.github/workflows/swift-sanitizer-address.yml +++ b/.github/workflows/swift-sanitizer-address.yml @@ -12,7 +12,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-14] + os: [macos-15] runs-on: ${{ matrix.os }} timeout-minutes: 60 From 693d61e53b6cb93fed01d0ae42672045ab29510c Mon Sep 17 00:00:00 2001 From: ordo-ci Date: Thu, 7 Nov 2024 10:02:48 +0000 Subject: [PATCH 32/39] =?UTF-8?q?ci:=20=F0=9F=94=84=20synced=20local=20'.g?= =?UTF-8?q?ithub/workflows/'=20with=20remote=20'workflows/swift'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/swift-macos-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/swift-macos-build.yml b/.github/workflows/swift-macos-build.yml index c140c86..87fcaba 100644 --- a/.github/workflows/swift-macos-build.yml +++ b/.github/workflows/swift-macos-build.yml @@ -14,7 +14,7 @@ jobs: fail-fast: false matrix: os: [macos-15] - swift: [ "5.10", "6.0" ] +# swift: [ "5.10", "6.0" ] runs-on: ${{ matrix.os }} # env: From e98f9e0fd4afc947f96774a4c54baecca6590be7 Mon Sep 17 00:00:00 2001 From: ordo-ci Date: Thu, 7 Nov 2024 10:09:05 +0000 Subject: [PATCH 33/39] =?UTF-8?q?ci:=20=F0=9F=94=84=20synced=20local=20'.g?= =?UTF-8?q?ithub/workflows/'=20with=20remote=20'workflows/swift'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/swift-linux-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/swift-linux-build.yml b/.github/workflows/swift-linux-build.yml index 62b038f..96f2a65 100644 --- a/.github/workflows/swift-linux-build.yml +++ b/.github/workflows/swift-linux-build.yml @@ -14,7 +14,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest] - swift: [ "5.10", "6.0" ] +# swift: [ "5.10", "6.0" ] runs-on: ${{ matrix.os }} From 9386a5012efe3e307c60697cb3b1634c1f046379 Mon Sep 17 00:00:00 2001 From: dimlio <122263440+dimlio@users.noreply.github.com> Date: Fri, 8 Nov 2024 11:18:57 +0200 Subject: [PATCH 34/39] remove Consul start from workflows --- .github/actions/consul-start/action.yml | 13 --- .github/workflows/swift-benchmark-delta.yml | 5 - .github/workflows/swift-code-coverage.yml | 5 +- .github/workflows/swift-linux-build.yml | 11 +-- .github/workflows/swift-macos-build.yml | 21 ++-- .github/workflows/swift-sanitizer-address.yml | 9 +- .github/workflows/swift-sanitizer-thread.yml | 9 +- .swiftlint.yml | 95 ++++++++++++++++++- .swiftlint_base.yml | 93 ------------------ .swiftlint_refinement.yml | 1 - 10 files changed, 111 insertions(+), 151 deletions(-) delete mode 100644 .github/actions/consul-start/action.yml delete mode 100644 .swiftlint_base.yml delete mode 100644 .swiftlint_refinement.yml diff --git a/.github/actions/consul-start/action.yml b/.github/actions/consul-start/action.yml deleted file mode 100644 index f627212..0000000 --- a/.github/actions/consul-start/action.yml +++ /dev/null @@ -1,13 +0,0 @@ -name: "Start Consul" -runs: - using: "composite" - steps: - - uses: nahsi/setup-hashi-tool@v1 - if: github.repository == 'ordo-one/package-consul' || github.repository == 'ordo-one/package-distributed-system' - with: - name: consul - - name: Start consul - if: github.repository == 'ordo-one/package-consul' || github.repository == 'ordo-one/package-distributed-system' - shell: bash - run: | - consul agent -dev -log-level=warn & diff --git a/.github/workflows/swift-benchmark-delta.yml b/.github/workflows/swift-benchmark-delta.yml index b840196..c3b8a24 100644 --- a/.github/workflows/swift-benchmark-delta.yml +++ b/.github/workflows/swift-benchmark-delta.yml @@ -27,15 +27,10 @@ jobs: if: ${{ runner.os == 'Linux' }} run: | sudo apt-get install -y libjemalloc-dev - - name: Start consul - uses: ./.github/actions/consul-start - name: Git URL token override and misc run: | - #git config --global url."https://ordo-ci:${{ secrets.CI_MACHINE_PAT }}@github.com".insteadOf "https://github.com" - #/usr/bin/ordo-performance [ -d Benchmarks ] && echo "hasBenchmark=1" >> $GITHUB_ENV [ -f Benchmarks/Package.swift ] && echo "BENCHMARK_PACKAGE_PATH=--package-path Benchmarks" >> $GITHUB_ENV - echo "BENCHMARK_RUN_URL=https://github.com/ordo-one/${{ github.event.repository.name }}/actions/runs/${{ github.run_id }}" >> $GITHUB_ENV echo "/opt/homebrew/bin:/usr/local/bin" >> $GITHUB_PATH - name: Run benchmarks for PR branch if: ${{ env.hasBenchmark == '1' }} diff --git a/.github/workflows/swift-code-coverage.yml b/.github/workflows/swift-code-coverage.yml index 6fad12f..f160443 100644 --- a/.github/workflows/swift-code-coverage.yml +++ b/.github/workflows/swift-code-coverage.yml @@ -5,7 +5,7 @@ on: push: branches: [ main ] pull_request: - branches: [ main, next ] + branches: [ main ] jobs: test-code-coverage: runs-on: [ubuntu-22.04] @@ -23,9 +23,6 @@ jobs: - name: Swift version run: swift --version - - name: Start consul - uses: ./.github/actions/consul-start - - name: Run tests continue-on-error: true run: | diff --git a/.github/workflows/swift-linux-build.yml b/.github/workflows/swift-linux-build.yml index 96f2a65..1c9cf6d 100644 --- a/.github/workflows/swift-linux-build.yml +++ b/.github/workflows/swift-linux-build.yml @@ -5,7 +5,7 @@ on: push: branches: [ main ] pull_request: - branches: [ main, next ] + branches: [ main ] jobs: build-linux: @@ -24,10 +24,7 @@ jobs: with: swift-version: ${{ matrix.swift }} - - uses: actions/checkout@v4 - - - name: Start consul - uses: ./.github/actions/consul-start + - uses: actions/checkout@v4 - name: Ubuntu deps if: ${{ runner.os == 'Linux' }} @@ -42,6 +39,4 @@ jobs: - name: Run tests run: | - if [ -d Tests ]; then - swift test --parallel - fi + [ -d Tests ] && swift test --parallel diff --git a/.github/workflows/swift-macos-build.yml b/.github/workflows/swift-macos-build.yml index 87fcaba..bc1164f 100644 --- a/.github/workflows/swift-macos-build.yml +++ b/.github/workflows/swift-macos-build.yml @@ -5,8 +5,8 @@ on: push: branches: [ main ] pull_request: - branches: [ main, next ] - + branches: [ main ] + jobs: build-macos: timeout-minutes: 60 @@ -17,8 +17,6 @@ jobs: # swift: [ "5.10", "6.0" ] runs-on: ${{ matrix.os }} -# env: -# DEVELOPER_DIR: /Applications/Xcode_16.1.app/Contents/Developer steps: - uses: swift-actions/setup-swift@v2 @@ -35,24 +33,21 @@ jobs: - uses: actions/checkout@v4 - - name: Start consul - uses: ./.github/actions/consul-start - - name: GH auth run: | echo "machine api.github.com login ${{ secrets.GITHUB_TOKEN }} password x-oauth-basic" > $HOME/.netrc cat ~/.netrc + - name: Swift version run: swift --version + - name: Build run: swift build + - name: Run tests run: | - if [ -d Tests ]; then - swift test --parallel - fi + [ -d Tests ] && swift test --parallel + - name: Run tests (release) run: | - if [ -d Tests ]; then - swift test -c release --parallel - fi + [ -d Tests ] && swift test -c release --parallel diff --git a/.github/workflows/swift-sanitizer-address.yml b/.github/workflows/swift-sanitizer-address.yml index f811bce..dddeb36 100644 --- a/.github/workflows/swift-sanitizer-address.yml +++ b/.github/workflows/swift-sanitizer-address.yml @@ -5,7 +5,7 @@ on: push: branches: [ main ] pull_request: - branches: [ main, next ] + branches: [ main ] jobs: address-sanitizer: @@ -31,9 +31,6 @@ jobs: - uses: actions/checkout@v4 - - name: Start consul - uses: ./.github/actions/consul-start - - name: Swift version run: swift --version @@ -43,9 +40,9 @@ jobs: - name: Run address sanitizer run: swift test --sanitize=address - + - name: Clean before release build sanitizier run: swift package clean - + - name: Run address sanitizer on release build run: swift test --sanitize=address -c release -Xswiftc -enable-testing diff --git a/.github/workflows/swift-sanitizer-thread.yml b/.github/workflows/swift-sanitizer-thread.yml index 932fba9..437b1a9 100644 --- a/.github/workflows/swift-sanitizer-thread.yml +++ b/.github/workflows/swift-sanitizer-thread.yml @@ -5,7 +5,7 @@ on: push: branches: [ main ] pull_request: - branches: [ main, next ] + branches: [ main ] jobs: thread-sanitizer: @@ -32,9 +32,6 @@ jobs: - uses: actions/checkout@v4 - - name: Start consul - uses: ./.github/actions/consul-start - - name: Swift version run: swift --version @@ -44,9 +41,9 @@ jobs: - name: Run thread sanitizer run: swift test --sanitize=thread - + - name: Clean before release build sanitizier run: swift package clean - + - name: Run thread sanitizer on release build run: swift test --sanitize=thread -c release -Xswiftc -enable-testing diff --git a/.swiftlint.yml b/.swiftlint.yml index b71da5a..347c8e5 100644 --- a/.swiftlint.yml +++ b/.swiftlint.yml @@ -1,2 +1,93 @@ -child_config: .swiftlint_refinement.yml -parent_config: .swiftlint_base.yml +#################################################################### +# DO NOT EDIT THIS FILE +# This is a master file maintained in https://github.com/ordo-one/public-repository-templates +# +# Add overrides into `swiftlint_refinement.yml` in the directory it self or +# .swiftlint.yml under the specific directory where the code is located +# +# Documentation is under https://github.com/realm/SwiftLint +#################################################################### + +included: + - Benchmarks + - Sources + - Tests +excluded: +analyzer_rules: + - unused_import +opt_in_rules: + - array_init + - attributes + - closure_end_indentation + - closure_spacing + - collection_alignment + - contains_over_filter_count + - contains_over_filter_is_empty + - contains_over_first_not_nil + - contains_over_range_nil_comparison + - discouraged_none_name + - discouraged_object_literal + - empty_collection_literal + - empty_count + - empty_string + - empty_xctest_method + - enum_case_associated_values_count + - explicit_init + - extension_access_modifier + - fallthrough + - fatal_error_message + - file_name + - first_where + - flatmap_over_map_reduce + - identical_operands + - joined_default_parameter + - last_where + - legacy_multiple + - literal_expression_end_indentation + - lower_acl_than_parent + - modifier_order + - nimble_operator + - nslocalizedstring_key + - number_separator + - object_literal + - operator_usage_whitespace + - overridden_super_call + - override_in_extension + - pattern_matching_keywords + - prefer_self_in_static_references + - prefer_self_type_over_type_of_self + - private_action + - private_outlet + - prohibited_interface_builder + - prohibited_super_call + - quick_discouraged_call + - quick_discouraged_focused_test + - quick_discouraged_pending_test + - reduce_into + - redundant_nil_coalescing + - redundant_type_annotation + - single_test_class + - sorted_first_last + - sorted_imports + - static_operator + - strong_iboutlet + - test_case_accessibility + - toggle_bool + - unavailable_function + - unneeded_parentheses_in_closure_argument + - unowned_variable_capture + - untyped_error_in_catch + - vertical_parameter_alignment_on_call + - vertical_whitespace_closing_braces + - vertical_whitespace_opening_braces + - xct_specific_matcher + - yoda_condition +line_length: + warning: 140 + error: 140 + ignores_comments: true + ignores_urls: true + ignores_function_declarations: true + ignores_interpolated_strings: true +identifier_name: + excluded: [id, i, j, k] diff --git a/.swiftlint_base.yml b/.swiftlint_base.yml deleted file mode 100644 index 347c8e5..0000000 --- a/.swiftlint_base.yml +++ /dev/null @@ -1,93 +0,0 @@ -#################################################################### -# DO NOT EDIT THIS FILE -# This is a master file maintained in https://github.com/ordo-one/public-repository-templates -# -# Add overrides into `swiftlint_refinement.yml` in the directory it self or -# .swiftlint.yml under the specific directory where the code is located -# -# Documentation is under https://github.com/realm/SwiftLint -#################################################################### - -included: - - Benchmarks - - Sources - - Tests -excluded: -analyzer_rules: - - unused_import -opt_in_rules: - - array_init - - attributes - - closure_end_indentation - - closure_spacing - - collection_alignment - - contains_over_filter_count - - contains_over_filter_is_empty - - contains_over_first_not_nil - - contains_over_range_nil_comparison - - discouraged_none_name - - discouraged_object_literal - - empty_collection_literal - - empty_count - - empty_string - - empty_xctest_method - - enum_case_associated_values_count - - explicit_init - - extension_access_modifier - - fallthrough - - fatal_error_message - - file_name - - first_where - - flatmap_over_map_reduce - - identical_operands - - joined_default_parameter - - last_where - - legacy_multiple - - literal_expression_end_indentation - - lower_acl_than_parent - - modifier_order - - nimble_operator - - nslocalizedstring_key - - number_separator - - object_literal - - operator_usage_whitespace - - overridden_super_call - - override_in_extension - - pattern_matching_keywords - - prefer_self_in_static_references - - prefer_self_type_over_type_of_self - - private_action - - private_outlet - - prohibited_interface_builder - - prohibited_super_call - - quick_discouraged_call - - quick_discouraged_focused_test - - quick_discouraged_pending_test - - reduce_into - - redundant_nil_coalescing - - redundant_type_annotation - - single_test_class - - sorted_first_last - - sorted_imports - - static_operator - - strong_iboutlet - - test_case_accessibility - - toggle_bool - - unavailable_function - - unneeded_parentheses_in_closure_argument - - unowned_variable_capture - - untyped_error_in_catch - - vertical_parameter_alignment_on_call - - vertical_whitespace_closing_braces - - vertical_whitespace_opening_braces - - xct_specific_matcher - - yoda_condition -line_length: - warning: 140 - error: 140 - ignores_comments: true - ignores_urls: true - ignores_function_declarations: true - ignores_interpolated_strings: true -identifier_name: - excluded: [id, i, j, k] diff --git a/.swiftlint_refinement.yml b/.swiftlint_refinement.yml deleted file mode 100644 index 65ed8fb..0000000 --- a/.swiftlint_refinement.yml +++ /dev/null @@ -1 +0,0 @@ -excluded: From edfb762b147b8ce6bba05addd6e9fbcea39fda4e Mon Sep 17 00:00:00 2001 From: dimlio <122263440+dimlio@users.noreply.github.com> Date: Fri, 8 Nov 2024 11:26:41 +0200 Subject: [PATCH 35/39] remove links to ordo repos --- .github/workflows/swift-benchmark-delta.yml | 4 +++- .gitignore | 4 ---- .swiftlint.yml | 6 ------ 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/.github/workflows/swift-benchmark-delta.yml b/.github/workflows/swift-benchmark-delta.yml index c3b8a24..6a9e367 100644 --- a/.github/workflows/swift-benchmark-delta.yml +++ b/.github/workflows/swift-benchmark-delta.yml @@ -18,15 +18,18 @@ jobs: - uses: actions/checkout@v4 with: fetch-depth: 0 + - name: Homebrew Mac if: ${{ runner.os == 'Macos' }} run: | echo "/opt/homebrew/bin:/usr/local/bin" >> $GITHUB_PATH brew install jemalloc + - name: Ubuntu deps if: ${{ runner.os == 'Linux' }} run: | sudo apt-get install -y libjemalloc-dev + - name: Git URL token override and misc run: | [ -d Benchmarks ] && echo "hasBenchmark=1" >> $GITHUB_ENV @@ -92,5 +95,4 @@ jobs: - name: Exit with correct status if: ${{ success() || failure() }} run: | - #/usr/bin/ordo-performance powersave exit ${{ env.exitStatus }} diff --git a/.gitignore b/.gitignore index 0dea6af..b02bd57 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,3 @@ -#################################################################### -# DO NOT EDIT THIS FILE MANUALLY -# This is a master file maintained in https://github.com/ordo-one/repository-templates - # Xcode # # gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore diff --git a/.swiftlint.yml b/.swiftlint.yml index 347c8e5..3497766 100644 --- a/.swiftlint.yml +++ b/.swiftlint.yml @@ -1,10 +1,4 @@ #################################################################### -# DO NOT EDIT THIS FILE -# This is a master file maintained in https://github.com/ordo-one/public-repository-templates -# -# Add overrides into `swiftlint_refinement.yml` in the directory it self or -# .swiftlint.yml under the specific directory where the code is located -# # Documentation is under https://github.com/realm/SwiftLint #################################################################### From 3272dc97ebeeb692f546a506f3f50c00315fcbc6 Mon Sep 17 00:00:00 2001 From: dimlio <122263440+dimlio@users.noreply.github.com> Date: Fri, 8 Nov 2024 11:31:29 +0200 Subject: [PATCH 36/39] run tests on release build for linux --- .github/workflows/swift-linux-build.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/swift-linux-build.yml b/.github/workflows/swift-linux-build.yml index 1c9cf6d..76bc358 100644 --- a/.github/workflows/swift-linux-build.yml +++ b/.github/workflows/swift-linux-build.yml @@ -40,3 +40,7 @@ jobs: - name: Run tests run: | [ -d Tests ] && swift test --parallel + + - name: Run tests (release) + run: | + [ -d Tests ] && swift test -c release --parallel From 483907e69091843a8664f142407e9510ef80656b Mon Sep 17 00:00:00 2001 From: dimlio <122263440+dimlio@users.noreply.github.com> Date: Fri, 8 Nov 2024 11:35:17 +0200 Subject: [PATCH 37/39] class -> static to make swiftlint happy --- Tests/HistogramTests/HistogramDataAccessTests.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tests/HistogramTests/HistogramDataAccessTests.swift b/Tests/HistogramTests/HistogramDataAccessTests.swift index baeee9d..29da808 100644 --- a/Tests/HistogramTests/HistogramDataAccessTests.swift +++ b/Tests/HistogramTests/HistogramDataAccessTests.swift @@ -36,7 +36,7 @@ final class HistogramDataAccessTests: XCTestCase { numberOfSignificantValueDigits: numberOfSignificantValueDigits ) - override class func setUp() { + override static func setUp() { // Log hypothetical scenario: 100 seconds of "perfect" 1msec results, sampled // 100 times per second (10,000 results), followed by a 100 second pause with // a single (100 second) recorded result. Recording is done indicating an expected From 2ec2ff0d919e2b84622e9230eb797696cfc5884d Mon Sep 17 00:00:00 2001 From: dimlio <122263440+dimlio@users.noreply.github.com> Date: Fri, 8 Nov 2024 12:04:48 +0200 Subject: [PATCH 38/39] simplify workflows --- .github/workflows/swift-code-coverage.yml | 5 ++--- .github/workflows/swift-linux-build.yml | 6 ++---- .github/workflows/swift-macos-build.yml | 6 ++---- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/.github/workflows/swift-code-coverage.yml b/.github/workflows/swift-code-coverage.yml index f160443..7539d9e 100644 --- a/.github/workflows/swift-code-coverage.yml +++ b/.github/workflows/swift-code-coverage.yml @@ -18,15 +18,14 @@ jobs: run: | sudo apt-get install -y libjemalloc-dev - - uses: khlopko/setup-swift@bfd61cbd14eeef55a27afc45138b61ced7174839 + - uses: swift-actions/setup-swift@v2 - name: Swift version run: swift --version - name: Run tests continue-on-error: true - run: | - [ -d Tests ] && swift test --parallel --enable-code-coverage + run: swift test --parallel --enable-code-coverage - name: Export code coverage run: | diff --git a/.github/workflows/swift-linux-build.yml b/.github/workflows/swift-linux-build.yml index 76bc358..af5d9d1 100644 --- a/.github/workflows/swift-linux-build.yml +++ b/.github/workflows/swift-linux-build.yml @@ -38,9 +38,7 @@ jobs: run: swift build - name: Run tests - run: | - [ -d Tests ] && swift test --parallel + run: swift test --parallel - name: Run tests (release) - run: | - [ -d Tests ] && swift test -c release --parallel + run: swift test -c release --parallel diff --git a/.github/workflows/swift-macos-build.yml b/.github/workflows/swift-macos-build.yml index bc1164f..a72a065 100644 --- a/.github/workflows/swift-macos-build.yml +++ b/.github/workflows/swift-macos-build.yml @@ -45,9 +45,7 @@ jobs: run: swift build - name: Run tests - run: | - [ -d Tests ] && swift test --parallel + run: swift test --parallel - name: Run tests (release) - run: | - [ -d Tests ] && swift test -c release --parallel + run: swift test -c release --parallel From 2bb7cf644436c682dc10c24c746b5fb184c07e98 Mon Sep 17 00:00:00 2001 From: dimlio <122263440+dimlio@users.noreply.github.com> Date: Fri, 8 Nov 2024 15:35:48 +0200 Subject: [PATCH 39/39] no benchmarks --- .github/workflows/swift-benchmark-delta.yml | 98 --------------------- 1 file changed, 98 deletions(-) delete mode 100644 .github/workflows/swift-benchmark-delta.yml diff --git a/.github/workflows/swift-benchmark-delta.yml b/.github/workflows/swift-benchmark-delta.yml deleted file mode 100644 index 6a9e367..0000000 --- a/.github/workflows/swift-benchmark-delta.yml +++ /dev/null @@ -1,98 +0,0 @@ -name: Benchmark PR vs main - -on: - workflow_dispatch: - pull_request: - branches: [ main ] - -jobs: - benchmark-delta: - timeout-minutes: 30 - runs-on: ${{ matrix.os }} - - strategy: - matrix: - os: [ubuntu-latest] - - steps: - - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - - name: Homebrew Mac - if: ${{ runner.os == 'Macos' }} - run: | - echo "/opt/homebrew/bin:/usr/local/bin" >> $GITHUB_PATH - brew install jemalloc - - - name: Ubuntu deps - if: ${{ runner.os == 'Linux' }} - run: | - sudo apt-get install -y libjemalloc-dev - - - name: Git URL token override and misc - run: | - [ -d Benchmarks ] && echo "hasBenchmark=1" >> $GITHUB_ENV - [ -f Benchmarks/Package.swift ] && echo "BENCHMARK_PACKAGE_PATH=--package-path Benchmarks" >> $GITHUB_ENV - echo "/opt/homebrew/bin:/usr/local/bin" >> $GITHUB_PATH - - name: Run benchmarks for PR branch - if: ${{ env.hasBenchmark == '1' }} - run: | - echo "exitStatus=1" >> $GITHUB_ENV - swift package ${BENCHMARK_PACKAGE_PATH} --disable-sandbox benchmark baseline update pull_request --no-progress - - name: Switch to branch 'main' - if: ${{ env.hasBenchmark == '1' }} - run: | - git stash - git checkout main - - name: Run benchmarks for branch 'main' - if: ${{ env.hasBenchmark == '1' }} - run: | - swift package ${BENCHMARK_PACKAGE_PATH} --disable-sandbox benchmark baseline update main --no-progress - - name: Compare PR and main - if: ${{ env.hasBenchmark == '1' }} - id: benchmark - continue-on-error: true - run: | - echo $(date) >> $GITHUB_STEP_SUMMARY - swift package ${BENCHMARK_PACKAGE_PATH} benchmark baseline check main pull_request --format markdown >> $GITHUB_STEP_SUMMARY - echo "exitStatus=$?" >> $GITHUB_ENV - - if: ${{ env.exitStatus == '0' }} - name: Pull request comment text same - run: | - { - echo "_Pull request is the same as baseline_" - echo "[Pull request benchmark comparison [${{ matrix.os }}] with 'main' run at $(date -Iseconds)]($BENCHMARK_RUN_URL)" - } > benchmark_comment - - if: ${{ env.exitStatus == '1' }} - name: Pull request comment text failure - run: | - { - echo "_Pull request had an unknown failure_" - echo "[Pull request benchmark comparison [${{ matrix.os }}] with 'main' run at $(date -Iseconds)]($BENCHMARK_RUN_URL)" - } > benchmark_comment - - if: ${{ env.exitStatus == '2' }} - name: Pull request comment text regression - run: | - { - echo "_Pull request had a regression_" - echo "[Pull request benchmark comparison [${{ matrix.os }}] with 'main' run at $(date -Iseconds)]($BENCHMARK_RUN_URL)" - } > benchmark_comment - - if: ${{ env.exitStatus == '4' }} - name: Pull request comment text improvement - run: | - { - echo "_Pull request had a performance improvement_" - echo "[Pull request benchmark comparison [${{ matrix.os }}] with 'main' run at $(date -Iseconds)]($BENCHMARK_RUN_URL)" - } > benchmark_comment - - name: Comment PR - if: ${{ env.hasBenchmark == '1' }} - uses: thollander/actions-comment-pull-request@v3 - with: - github-token: ${{ secrets.GITHUB_TOKEN }} - file-path: benchmark_comment - comment-tag: 'Pull request benchmark comparison [${{ matrix.os }}] with' - - name: Exit with correct status - if: ${{ success() || failure() }} - run: | - exit ${{ env.exitStatus }}