Skip to content

Commit 16aa98d

Browse files
committed
Review comments
1 parent b0885b4 commit 16aa98d

File tree

4 files changed

+12
-5
lines changed

4 files changed

+12
-5
lines changed

.github/workflows/benchmarks.yml

+8-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,13 @@ name: Benchmarks
33
on:
44
workflow_call:
55
inputs:
6+
benchmark_package_path:
7+
type: string
8+
description: "Path to the directory containing the benchmarking package. Defaults to ."
9+
default: "."
10+
swift_package_arguments:
11+
type: string
12+
description: "Arguments to the switch package command invocation e.g. `--disable-sandbox`"
613
linux_5_8_enabled:
714
type: boolean
815
description: "Boolean to enable the Linux 5.8 Swift version matrix job. Defaults to true."
@@ -30,7 +37,7 @@ jobs:
3037
uses: ./.github/workflows/pull_request_swift_matrix.yml
3138
with:
3239
name: "Benchmarks"
33-
matrix_linux_command: "apt-get update -y -q && apt-get install -y -q libjemalloc-dev && swift package --package-path Benchmarks/ --disable-sandbox benchmark baseline check --check-absolute-path Benchmarks/Thresholds/${SWIFT_VERSION}/"
40+
matrix_linux_command: "apt-get update -y -q && apt-get install -y -q libjemalloc-dev && swift package --package-path ${{ inputs.benchmark_package_path }} ${{ inputs.swift_package_arguments }} benchmark baseline check --check-absolute-path ${{ inputs.benchmark_package_path }}/Thresholds/${SWIFT_VERSION}/"
3441
matrix_linux_5_8_enabled: ${{ inputs.linux_5_8_enabled }}
3542
matrix_linux_5_9_enabled: ${{ inputs.linux_5_9_enabled }}
3643
matrix_linux_5_10_enabled: ${{ inputs.linux_5_10_enabled }}

.github/workflows/cxx_interop.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ jobs:
3030
uses: ./.github/workflows/pull_request_swift_matrix.yml
3131
with:
3232
name: "Cxx interop"
33-
matrix_linux_command: "apt-get update -y -q && apt-get install -y -q jq && ./scripts/check-cxx-interop-compatibility.sh"
33+
matrix_linux_command: "apt-get update -y -q && apt-get install -y -q jq && curl -s https://raw.githubusercontent.com/apple/swift-nio/main/scripts/check-cxx-interop-compatibility.sh | bash"
3434
matrix_linux_5_8_enabled: ${{ inputs.linux_5_8_enabled }}
3535
matrix_linux_5_9_enabled: ${{ inputs.linux_5_9_enabled }}
3636
matrix_linux_5_10_enabled: ${{ inputs.linux_5_10_enabled }}
3737
matrix_linux_nightly_6_0_enabled: ${{ inputs.linux_nightly_6_0_enabled }}
38-
matrix_linux_nightly_main_enabled: ${{ inputs.linux_nightly_main_enabled }}
38+
matrix_linux_nightly_main_enabled: ${{ inputs.linux_nightly_main_enabled }}

.github/workflows/pull_request_swift_matrix.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -93,4 +93,4 @@ jobs:
9393
COMMAND_OVERRIDE_NIGHTLY_MAIN: ${{ inputs.matrix_linux_nightly_main_command_override }}
9494
run: |
9595
apt-get -qq update && apt-get -qq -y install curl
96-
curl -s https://raw.githubusercontent.com/apple/swift-nio/main/scripts/check-matrix-job.sh | bash
96+
curl -s https://raw.githubusercontent.com/apple/swift-nio/main/scripts/check-matrix-job.sh | bash

.github/workflows/unit_tests.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,4 +60,4 @@ jobs:
6060
matrix_linux_nightly_6_0_enabled: ${{ inputs.linux_nightly_6_0_enabled }}
6161
matrix_linux_nightly_6_0_command_override: "swift test ${{ inputs.linux_nightly_6_0_arguments_override }}"
6262
matrix_linux_nightly_main_enabled: ${{ inputs.linux_nightly_main_enabled }}
63-
matrix_linux_nightly_main_command_override: "swift test ${{ inputs.linux_nightly_main_arguments_override }}"
63+
matrix_linux_nightly_main_command_override: "swift test ${{ inputs.linux_nightly_main_arguments_override }}"

0 commit comments

Comments
 (0)