From 533958880edfe1326d7d361f36f8c13efb6041bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jiri=20Dan=C4=9Bk?= Date: Wed, 18 May 2022 15:25:58 +0200 Subject: [PATCH 01/14] add proton parameter for manual action run --- .github/workflows/build.yaml | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 58abacd8c..7a143137d 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -19,7 +19,21 @@ name: Build -on: [push, pull_request, workflow_dispatch] +on: + push: + pull_request: + workflow_dispatch: + inputs: + protonRepository: + description: GitHub repository where to fetch Qpid Proton from + type: string + default: apache/qpid-proton + required: false + protonBranch: + description: Branch in the protonRepository to check out (in addition to hardcoded branches) + type: string + default: main + required: false jobs: compile: @@ -31,7 +45,7 @@ jobs: os: [ubuntu-20.04] buildType: [Debug] runtimeCheck: [asan] - protonGitRef: [main, 0.37.0] + protonGitRef: [${{ inputs.protonBranch }}, 0.37.0] env: BuildType: ${{matrix.buildType}} ProtonBuildDir: ${{github.workspace}}/qpid-proton/build @@ -71,7 +85,7 @@ jobs: - uses: actions/checkout@v3 with: - repository: 'apache/qpid-proton' + repository: ${{ inputs.protonRepository }} ref: ${{ matrix.protonGitRef }} path: 'qpid-proton' @@ -176,7 +190,7 @@ jobs: os: [ubuntu-20.04] buildType: [Debug] runtimeCheck: [asan] - protonGitRef: [main, 0.37.0] + protonGitRef: [ ${{inputs.protonBranch }}, 0.37.0] shard: [1, 2] shards: [2] env: @@ -273,7 +287,7 @@ jobs: containerTag: ['35'] buildType: [RelWithDebInfo] runtimeCheck: [asan, tsan] - protonGitRef: [main, 0.37.0] + protonGitRef: [${{ inputs.protonBranch }}, 0.37.0] shard: [ 1, 2 ] shards: [ 2 ] include: @@ -282,14 +296,14 @@ jobs: container: 'centos' containerTag: stream8 runtimeCheck: OFF - protonGitRef: main + protonGitRef: ${{ inputs.protonBranch }} shard: 1 shards: 2 - os: ubuntu-20.04 container: 'centos' containerTag: stream8 runtimeCheck: OFF - protonGitRef: main + protonGitRef: ${{ inputs.protonBranch }} shard: 2 shards: 2 - os: ubuntu-20.04 @@ -370,7 +384,7 @@ jobs: - uses: actions/checkout@v3 with: - repository: 'apache/qpid-proton' + repository: ${{ inputs.protonRepository }} ref: ${{ matrix.protonGitRef }} path: 'qpid-proton' @@ -553,8 +567,8 @@ jobs: - uses: actions/checkout@v3 with: - repository: 'apache/qpid-proton' - ref: main + repository: ${{ inputs.protonRepository }} + ref: ${{ inputs.protonBranch }} path: 'qpid-proton' - name: Install Linux build dependencies From c2feb49f9b8eda429e62a93a1ab3e9f8528788a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jiri=20Dan=C4=9Bk?= Date: Wed, 18 May 2022 15:34:36 +0200 Subject: [PATCH 02/14] ? --- .github/workflows/build.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 7a143137d..bbf75d474 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -45,7 +45,7 @@ jobs: os: [ubuntu-20.04] buildType: [Debug] runtimeCheck: [asan] - protonGitRef: [${{ inputs.protonBranch }}, 0.37.0] + protonGitRef: [${{ github.event.inputs.protonBranch || 'main' }}, 0.37.0] env: BuildType: ${{matrix.buildType}} ProtonBuildDir: ${{github.workspace}}/qpid-proton/build @@ -85,7 +85,7 @@ jobs: - uses: actions/checkout@v3 with: - repository: ${{ inputs.protonRepository }} + repository: ${{ github.event.inputs.protonRepository || 'apache/qpid-proton' }} ref: ${{ matrix.protonGitRef }} path: 'qpid-proton' From 614652124d9375e8ccd73ab4b492d3e4e29fc615 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jiri=20Dan=C4=9Bk?= Date: Wed, 18 May 2022 15:35:54 +0200 Subject: [PATCH 03/14] ? --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index bbf75d474..93b2c2456 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -45,7 +45,7 @@ jobs: os: [ubuntu-20.04] buildType: [Debug] runtimeCheck: [asan] - protonGitRef: [${{ github.event.inputs.protonBranch || 'main' }}, 0.37.0] + protonGitRef: [baf, 0.37.0] env: BuildType: ${{matrix.buildType}} ProtonBuildDir: ${{github.workspace}}/qpid-proton/build From 116ae62a33fcd00454336c2eac58a85bfa8e4622 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jiri=20Dan=C4=9Bk?= Date: Wed, 18 May 2022 15:37:06 +0200 Subject: [PATCH 04/14] ? --- .github/workflows/build.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 93b2c2456..7ad374977 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -45,7 +45,9 @@ jobs: os: [ubuntu-20.04] buildType: [Debug] runtimeCheck: [asan] - protonGitRef: [baf, 0.37.0] + protonGitRef: + - ${{ github.event.inputs.protonBranch || 'main' }} + - 0.37.0 env: BuildType: ${{matrix.buildType}} ProtonBuildDir: ${{github.workspace}}/qpid-proton/build From 7c9a2b93a1fde5ac07bd0ca00d84dfea8be1680c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jiri=20Dan=C4=9Bk?= Date: Wed, 18 May 2022 15:38:01 +0200 Subject: [PATCH 05/14] ? --- .github/workflows/build.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 7ad374977..592071905 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -192,7 +192,9 @@ jobs: os: [ubuntu-20.04] buildType: [Debug] runtimeCheck: [asan] - protonGitRef: [ ${{inputs.protonBranch }}, 0.37.0] + protonGitRef: + - ${{github.event.inputs.protonBranch || 'apache/qpid-proton' }} + - 0.37.0 shard: [1, 2] shards: [2] env: From acd32203d5cd0fdb7e5c0f1c5d87a34bba3b3bd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jiri=20Dan=C4=9Bk?= Date: Wed, 18 May 2022 15:38:06 +0200 Subject: [PATCH 06/14] ? --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 592071905..22d728cc5 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -193,7 +193,7 @@ jobs: buildType: [Debug] runtimeCheck: [asan] protonGitRef: - - ${{github.event.inputs.protonBranch || 'apache/qpid-proton' }} + - ${{ github.event.inputs.protonBranch || 'apache/qpid-proton' }} - 0.37.0 shard: [1, 2] shards: [2] From 1252fa2097a4b537f3b406acfcdb177469426e5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jiri=20Dan=C4=9Bk?= Date: Wed, 18 May 2022 15:48:07 +0200 Subject: [PATCH 07/14] ? --- .github/workflows/build.yaml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 22d728cc5..0c6a72e40 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -291,7 +291,9 @@ jobs: containerTag: ['35'] buildType: [RelWithDebInfo] runtimeCheck: [asan, tsan] - protonGitRef: [${{ inputs.protonBranch }}, 0.37.0] + protonGitRef: + - ${{ github.event.inputs.protonBranch }} + - 0.37.0 shard: [ 1, 2 ] shards: [ 2 ] include: @@ -300,14 +302,14 @@ jobs: container: 'centos' containerTag: stream8 runtimeCheck: OFF - protonGitRef: ${{ inputs.protonBranch }} + protonGitRef: ${{ github.event.inputs.protonBranch }} shard: 1 shards: 2 - os: ubuntu-20.04 container: 'centos' containerTag: stream8 runtimeCheck: OFF - protonGitRef: ${{ inputs.protonBranch }} + protonGitRef: ${{ github.event.inputs.protonBranch }} shard: 2 shards: 2 - os: ubuntu-20.04 @@ -388,7 +390,7 @@ jobs: - uses: actions/checkout@v3 with: - repository: ${{ inputs.protonRepository }} + repository: ${{ github.event.inputs.protonRepository }} ref: ${{ matrix.protonGitRef }} path: 'qpid-proton' @@ -571,8 +573,8 @@ jobs: - uses: actions/checkout@v3 with: - repository: ${{ inputs.protonRepository }} - ref: ${{ inputs.protonBranch }} + repository: ${{ github.event.inputs.protonRepository }} + ref: ${{ github.event.inputs.protonBranch }} path: 'qpid-proton' - name: Install Linux build dependencies From 8d81d11bfd6b16f4dc915727e963e609bc42a576 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jiri=20Dan=C4=9Bk?= Date: Wed, 18 May 2022 15:53:07 +0200 Subject: [PATCH 08/14] escape default --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 0c6a72e40..bf8501d2a 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -27,7 +27,7 @@ on: protonRepository: description: GitHub repository where to fetch Qpid Proton from type: string - default: apache/qpid-proton + default: 'apache/qpid-proton' required: false protonBranch: description: Branch in the protonRepository to check out (in addition to hardcoded branches) From 03fd384deafc8aa7b642752b4652125eeb8873ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jiri=20Dan=C4=9Bk?= Date: Wed, 18 May 2022 16:04:46 +0200 Subject: [PATCH 09/14] escape default --- .github/workflows/build.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index bf8501d2a..8c437fd12 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -46,7 +46,7 @@ jobs: buildType: [Debug] runtimeCheck: [asan] protonGitRef: - - ${{ github.event.inputs.protonBranch || 'main' }} + - ${{ github.event.inputs.protonBranch }} - 0.37.0 env: BuildType: ${{matrix.buildType}} @@ -193,7 +193,7 @@ jobs: buildType: [Debug] runtimeCheck: [asan] protonGitRef: - - ${{ github.event.inputs.protonBranch || 'apache/qpid-proton' }} + - ${{ github.event.inputs.protonBranch }} - 0.37.0 shard: [1, 2] shards: [2] @@ -390,7 +390,7 @@ jobs: - uses: actions/checkout@v3 with: - repository: ${{ github.event.inputs.protonRepository }} + repository: ${{ github.event.inputs.protonRepository || 'apache/qpid-proton' }} ref: ${{ matrix.protonGitRef }} path: 'qpid-proton' @@ -573,7 +573,7 @@ jobs: - uses: actions/checkout@v3 with: - repository: ${{ github.event.inputs.protonRepository }} + repository: ${{ github.event.inputs.protonRepository || 'apache/qpid-proton' }} ref: ${{ github.event.inputs.protonBranch }} path: 'qpid-proton' From ce35fc64a751b6fecc26e3f2d73e22bc5f9f0fcc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jiri=20Dan=C4=9Bk?= Date: Wed, 18 May 2022 16:05:18 +0200 Subject: [PATCH 10/14] remove defaults in code --- .github/workflows/build.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 8c437fd12..05110303a 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -87,7 +87,7 @@ jobs: - uses: actions/checkout@v3 with: - repository: ${{ github.event.inputs.protonRepository || 'apache/qpid-proton' }} + repository: ${{ github.event.inputs.protonRepository }} ref: ${{ matrix.protonGitRef }} path: 'qpid-proton' @@ -390,7 +390,7 @@ jobs: - uses: actions/checkout@v3 with: - repository: ${{ github.event.inputs.protonRepository || 'apache/qpid-proton' }} + repository: ${{ github.event.inputs.protonRepository }} ref: ${{ matrix.protonGitRef }} path: 'qpid-proton' @@ -573,7 +573,7 @@ jobs: - uses: actions/checkout@v3 with: - repository: ${{ github.event.inputs.protonRepository || 'apache/qpid-proton' }} + repository: ${{ github.event.inputs.protonRepository }} ref: ${{ github.event.inputs.protonBranch }} path: 'qpid-proton' From c5ed27b30edbdca036429fc66eb34e3217fcb3d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jiri=20Dan=C4=9Bk?= Date: Wed, 18 May 2022 16:59:44 +0200 Subject: [PATCH 11/14] ? --- .github/workflows/build.yaml | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 05110303a..781715507 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -35,6 +35,10 @@ on: default: main required: false +env: + protonRepository: "${{ github.env.protonRepository || 'apache/qpid-proton' }}" + protonBranch: "${{ github.env.protonBranch || 'main' }}" + jobs: compile: name: "Compile (${{matrix.os}}, ${{matrix.runtimeCheck}}, proton ${{matrix.protonGitRef}})" @@ -46,7 +50,7 @@ jobs: buildType: [Debug] runtimeCheck: [asan] protonGitRef: - - ${{ github.event.inputs.protonBranch }} + - ${{ github.env.protonBranch }} - 0.37.0 env: BuildType: ${{matrix.buildType}} @@ -87,7 +91,7 @@ jobs: - uses: actions/checkout@v3 with: - repository: ${{ github.event.inputs.protonRepository }} + repository: ${{ github.env.protonRepository }} ref: ${{ matrix.protonGitRef }} path: 'qpid-proton' @@ -193,7 +197,7 @@ jobs: buildType: [Debug] runtimeCheck: [asan] protonGitRef: - - ${{ github.event.inputs.protonBranch }} + - ${{ github.env.protonBranch }} - 0.37.0 shard: [1, 2] shards: [2] @@ -292,7 +296,7 @@ jobs: buildType: [RelWithDebInfo] runtimeCheck: [asan, tsan] protonGitRef: - - ${{ github.event.inputs.protonBranch }} + - ${{ github.env.protonBranch }} - 0.37.0 shard: [ 1, 2 ] shards: [ 2 ] @@ -302,14 +306,14 @@ jobs: container: 'centos' containerTag: stream8 runtimeCheck: OFF - protonGitRef: ${{ github.event.inputs.protonBranch }} + protonGitRef: ${{ github.env.protonBranch }} shard: 1 shards: 2 - os: ubuntu-20.04 container: 'centos' containerTag: stream8 runtimeCheck: OFF - protonGitRef: ${{ github.event.inputs.protonBranch }} + protonGitRef: ${{ github.env.protonBranch }} shard: 2 shards: 2 - os: ubuntu-20.04 @@ -390,7 +394,7 @@ jobs: - uses: actions/checkout@v3 with: - repository: ${{ github.event.inputs.protonRepository }} + repository: ${{ github.env.protonRepository }} ref: ${{ matrix.protonGitRef }} path: 'qpid-proton' @@ -573,8 +577,8 @@ jobs: - uses: actions/checkout@v3 with: - repository: ${{ github.event.inputs.protonRepository }} - ref: ${{ github.event.inputs.protonBranch }} + repository: ${{ github.env.protonRepository }} + ref: ${{ github.env.protonBranch }} path: 'qpid-proton' - name: Install Linux build dependencies From b637a3598b6c071bb50b3fb9dcf145fd6a2f51cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jiri=20Dan=C4=9Bk?= Date: Wed, 18 May 2022 17:03:03 +0200 Subject: [PATCH 12/14] ? --- .github/workflows/build.yaml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 781715507..363f0c3f6 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -36,8 +36,8 @@ on: required: false env: - protonRepository: "${{ github.env.protonRepository || 'apache/qpid-proton' }}" - protonBranch: "${{ github.env.protonBranch || 'main' }}" + protonRepository: "${{ env.protonRepository || 'apache/qpid-proton' }}" + protonBranch: "${{ env.protonBranch || 'main' }}" jobs: compile: @@ -50,7 +50,7 @@ jobs: buildType: [Debug] runtimeCheck: [asan] protonGitRef: - - ${{ github.env.protonBranch }} + - ${{ env.protonBranch }} - 0.37.0 env: BuildType: ${{matrix.buildType}} @@ -91,7 +91,7 @@ jobs: - uses: actions/checkout@v3 with: - repository: ${{ github.env.protonRepository }} + repository: ${{ env.protonRepository }} ref: ${{ matrix.protonGitRef }} path: 'qpid-proton' @@ -197,7 +197,7 @@ jobs: buildType: [Debug] runtimeCheck: [asan] protonGitRef: - - ${{ github.env.protonBranch }} + - ${{ env.protonBranch }} - 0.37.0 shard: [1, 2] shards: [2] @@ -296,7 +296,7 @@ jobs: buildType: [RelWithDebInfo] runtimeCheck: [asan, tsan] protonGitRef: - - ${{ github.env.protonBranch }} + - ${{ env.protonBranch }} - 0.37.0 shard: [ 1, 2 ] shards: [ 2 ] @@ -306,14 +306,14 @@ jobs: container: 'centos' containerTag: stream8 runtimeCheck: OFF - protonGitRef: ${{ github.env.protonBranch }} + protonGitRef: ${{ env.protonBranch }} shard: 1 shards: 2 - os: ubuntu-20.04 container: 'centos' containerTag: stream8 runtimeCheck: OFF - protonGitRef: ${{ github.env.protonBranch }} + protonGitRef: ${{ env.protonBranch }} shard: 2 shards: 2 - os: ubuntu-20.04 @@ -394,7 +394,7 @@ jobs: - uses: actions/checkout@v3 with: - repository: ${{ github.env.protonRepository }} + repository: ${{ env.protonRepository }} ref: ${{ matrix.protonGitRef }} path: 'qpid-proton' @@ -577,8 +577,8 @@ jobs: - uses: actions/checkout@v3 with: - repository: ${{ github.env.protonRepository }} - ref: ${{ github.env.protonBranch }} + repository: ${{ env.protonRepository }} + ref: ${{ env.protonBranch }} path: 'qpid-proton' - name: Install Linux build dependencies From d59972535d179e62acf9c9a1de312e1a572aba5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jiri=20Dan=C4=9Bk?= Date: Wed, 18 May 2022 17:10:29 +0200 Subject: [PATCH 13/14] ? --- .github/workflows/build.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 363f0c3f6..b8148cf8e 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -36,8 +36,8 @@ on: required: false env: - protonRepository: "${{ env.protonRepository || 'apache/qpid-proton' }}" - protonBranch: "${{ env.protonBranch || 'main' }}" + protonRepository: "${{ github.event.inputs.protonRepository || 'apache/qpid-proton' }}" + protonBranch: "${{ github.event.inputs.protonBranch || 'main' }}" jobs: compile: From 22cca38de0c38a310adf421ac475287a72af5188 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jiri=20Dan=C4=9Bk?= Date: Wed, 18 May 2022 17:51:10 +0200 Subject: [PATCH 14/14] "" --- .github/workflows/build.yaml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index b8148cf8e..40e31b0be 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -35,6 +35,7 @@ on: default: main required: false +# known limitation https://github.com/actions/runner/issues/480 env: protonRepository: "${{ github.event.inputs.protonRepository || 'apache/qpid-proton' }}" protonBranch: "${{ github.event.inputs.protonBranch || 'main' }}" @@ -50,7 +51,7 @@ jobs: buildType: [Debug] runtimeCheck: [asan] protonGitRef: - - ${{ env.protonBranch }} + - ${{ github.event.inputs.protonBranch || 'main' }} - 0.37.0 env: BuildType: ${{matrix.buildType}} @@ -197,7 +198,7 @@ jobs: buildType: [Debug] runtimeCheck: [asan] protonGitRef: - - ${{ env.protonBranch }} + - ${{ github.event.inputs.protonBranch || 'main' }} - 0.37.0 shard: [1, 2] shards: [2] @@ -296,7 +297,7 @@ jobs: buildType: [RelWithDebInfo] runtimeCheck: [asan, tsan] protonGitRef: - - ${{ env.protonBranch }} + - ${{ github.event.inputs.protonBranch || 'main' }} - 0.37.0 shard: [ 1, 2 ] shards: [ 2 ] @@ -306,14 +307,14 @@ jobs: container: 'centos' containerTag: stream8 runtimeCheck: OFF - protonGitRef: ${{ env.protonBranch }} + protonGitRef: ${{ github.event.inputs.protonBranch || 'main' }} shard: 1 shards: 2 - os: ubuntu-20.04 container: 'centos' containerTag: stream8 runtimeCheck: OFF - protonGitRef: ${{ env.protonBranch }} + protonGitRef: ${{ github.event.inputs.protonBranch || 'main' }} shard: 2 shards: 2 - os: ubuntu-20.04