From 0bd1d1779871338f60d6d896f9a803210f3fb092 Mon Sep 17 00:00:00 2001 From: dzbaker Date: Fri, 14 Apr 2023 07:35:40 -0400 Subject: [PATCH 01/13] Create icbundle.yml --- .github/workflows/icbundle.yml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 .github/workflows/icbundle.yml diff --git a/.github/workflows/icbundle.yml b/.github/workflows/icbundle.yml new file mode 100644 index 000000000..1c91d2e48 --- /dev/null +++ b/.github/workflows/icbundle.yml @@ -0,0 +1,21 @@ +name: "Integration Candidate Bundle Generation" + +on: + workflow_dispatch: + +jobs: + generate-ic-bundle: + runs-on: ubuntu-latest + steps: + - name: Rebase IC branch + uses: actions/checkout@v3 + with: + fetch-depth: '0' + run: | + ls + git --version + git config user.name "GitHub Actions Bot" + git config user.email "<>" + git status + git tag + git describe From c1ce57902b569585d619bd53a99858f011c97376 Mon Sep 17 00:00:00 2001 From: dzbaker Date: Fri, 14 Apr 2023 07:38:37 -0400 Subject: [PATCH 02/13] Update icbundle.yml --- .github/workflows/icbundle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/icbundle.yml b/.github/workflows/icbundle.yml index 1c91d2e48..c04062bba 100644 --- a/.github/workflows/icbundle.yml +++ b/.github/workflows/icbundle.yml @@ -1,4 +1,4 @@ -name: "Integration Candidate Bundle Generation" +name: Integration Candidate Bundle Generation on: workflow_dispatch: From 950b71662a80004743412aa348b7de27832a8d48 Mon Sep 17 00:00:00 2001 From: dzbaker Date: Fri, 14 Apr 2023 07:42:05 -0400 Subject: [PATCH 03/13] Update icbundle.yml --- .github/workflows/icbundle.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/icbundle.yml b/.github/workflows/icbundle.yml index c04062bba..772188d24 100644 --- a/.github/workflows/icbundle.yml +++ b/.github/workflows/icbundle.yml @@ -1,5 +1,7 @@ name: Integration Candidate Bundle Generation +# Generate Integration Candidate branch for this repository. + on: workflow_dispatch: @@ -7,10 +9,11 @@ jobs: generate-ic-bundle: runs-on: ubuntu-latest steps: - - name: Rebase IC branch + - name: Checkout IC Branch uses: actions/checkout@v3 with: fetch-depth: '0' + - name: Rebase IC Branch run: | ls git --version From f1b8da2e4a0e9572c6b105d3f28a575c4c5d3a61 Mon Sep 17 00:00:00 2001 From: dzbaker Date: Fri, 14 Apr 2023 07:54:03 -0400 Subject: [PATCH 04/13] Update icbundle.yml --- .github/workflows/icbundle.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/icbundle.yml b/.github/workflows/icbundle.yml index 772188d24..224c74008 100644 --- a/.github/workflows/icbundle.yml +++ b/.github/workflows/icbundle.yml @@ -13,12 +13,11 @@ jobs: uses: actions/checkout@v3 with: fetch-depth: '0' + ref: main - name: Rebase IC Branch run: | - ls - git --version git config user.name "GitHub Actions Bot" git config user.email "<>" - git status - git tag - git describe + git pull + git checkout integration-candidate + git rebase main From 7c280f78012a76efa292c17f6968741bd11c05a5 Mon Sep 17 00:00:00 2001 From: dzbaker Date: Fri, 14 Apr 2023 08:17:50 -0400 Subject: [PATCH 05/13] Update icbundle.yml --- .github/workflows/icbundle.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/icbundle.yml b/.github/workflows/icbundle.yml index 224c74008..3cdf989eb 100644 --- a/.github/workflows/icbundle.yml +++ b/.github/workflows/icbundle.yml @@ -4,6 +4,11 @@ name: Integration Candidate Bundle Generation on: workflow_dispatch: + inputs: + pr_nums: + description: 'The pull request numbers to include. Comma separated' + required: true + type: string jobs: generate-ic-bundle: @@ -21,3 +26,5 @@ jobs: git pull git checkout integration-candidate git rebase main + - name: Merge each PR + echo ${{ inputs.pr_nums }} From f4f5a16ef1e22fb4ea73e95287dedf745abeef2e Mon Sep 17 00:00:00 2001 From: dzbaker Date: Fri, 14 Apr 2023 08:19:52 -0400 Subject: [PATCH 06/13] Update icbundle.yml --- .github/workflows/icbundle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/icbundle.yml b/.github/workflows/icbundle.yml index 3cdf989eb..f92f336dc 100644 --- a/.github/workflows/icbundle.yml +++ b/.github/workflows/icbundle.yml @@ -27,4 +27,4 @@ jobs: git checkout integration-candidate git rebase main - name: Merge each PR - echo ${{ inputs.pr_nums }} + run: echo ${{ inputs.pr_nums }} From 39a7dd0b62a24df5092d7a549e3af05bd33a268d Mon Sep 17 00:00:00 2001 From: dzbaker Date: Fri, 14 Apr 2023 08:21:20 -0400 Subject: [PATCH 07/13] Update icbundle.yml --- .github/workflows/icbundle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/icbundle.yml b/.github/workflows/icbundle.yml index f92f336dc..720bdf416 100644 --- a/.github/workflows/icbundle.yml +++ b/.github/workflows/icbundle.yml @@ -27,4 +27,4 @@ jobs: git checkout integration-candidate git rebase main - name: Merge each PR - run: echo ${{ inputs.pr_nums }} + run: echo ${{ inputs.pr_nums }} From 79175863061d69a9ac8da63980b4cbecb0b3f727 Mon Sep 17 00:00:00 2001 From: dzbaker Date: Fri, 14 Apr 2023 08:31:14 -0400 Subject: [PATCH 08/13] Update icbundle.yml --- .github/workflows/icbundle.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/icbundle.yml b/.github/workflows/icbundle.yml index 720bdf416..cafdcf266 100644 --- a/.github/workflows/icbundle.yml +++ b/.github/workflows/icbundle.yml @@ -27,4 +27,9 @@ jobs: git checkout integration-candidate git rebase main - name: Merge each PR - run: echo ${{ inputs.pr_nums }} + run: | + prs = $(echo ${{ inputs.pr_nums }} | | tr "," "\n") + for pr in $prs + do + echo $pr + done From b39500ce0b5ac3f5bc6e95b34d8680a3c37432d7 Mon Sep 17 00:00:00 2001 From: dzbaker Date: Fri, 14 Apr 2023 08:32:26 -0400 Subject: [PATCH 09/13] Update icbundle.yml --- .github/workflows/icbundle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/icbundle.yml b/.github/workflows/icbundle.yml index cafdcf266..4dc1ca64e 100644 --- a/.github/workflows/icbundle.yml +++ b/.github/workflows/icbundle.yml @@ -28,7 +28,7 @@ jobs: git rebase main - name: Merge each PR run: | - prs = $(echo ${{ inputs.pr_nums }} | | tr "," "\n") + prs = $(echo ${{ inputs.pr_nums }} | tr "," "\n") for pr in $prs do echo $pr From 31e739dd54820aa6aa73d454374f5c9f08c7cd5b Mon Sep 17 00:00:00 2001 From: dzbaker Date: Fri, 14 Apr 2023 08:33:26 -0400 Subject: [PATCH 10/13] Update icbundle.yml --- .github/workflows/icbundle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/icbundle.yml b/.github/workflows/icbundle.yml index 4dc1ca64e..49c0dc2a9 100644 --- a/.github/workflows/icbundle.yml +++ b/.github/workflows/icbundle.yml @@ -28,7 +28,7 @@ jobs: git rebase main - name: Merge each PR run: | - prs = $(echo ${{ inputs.pr_nums }} | tr "," "\n") + prs=$(echo ${{ inputs.pr_nums }} | tr "," "\n") for pr in $prs do echo $pr From 496a714fd3c9de803c75e366482d5fcc318ece9c Mon Sep 17 00:00:00 2001 From: dzbaker Date: Fri, 14 Apr 2023 08:43:11 -0400 Subject: [PATCH 11/13] Update icbundle.yml --- .github/workflows/icbundle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/icbundle.yml b/.github/workflows/icbundle.yml index 49c0dc2a9..4eef1b513 100644 --- a/.github/workflows/icbundle.yml +++ b/.github/workflows/icbundle.yml @@ -31,5 +31,5 @@ jobs: prs=$(echo ${{ inputs.pr_nums }} | tr "," "\n") for pr in $prs do - echo $pr + git merge origin/pull/$pr/head --no-ff -m "Merge pull request #$pr from branch\n\nmessage" done From c1cfc109754aff8cfd2d4d0a77bff2d6c030b615 Mon Sep 17 00:00:00 2001 From: dzbaker Date: Fri, 14 Apr 2023 08:44:58 -0400 Subject: [PATCH 12/13] Create test1 --- test1 | 1 + 1 file changed, 1 insertion(+) create mode 100644 test1 diff --git a/test1 b/test1 new file mode 100644 index 000000000..85c4b74be --- /dev/null +++ b/test1 @@ -0,0 +1 @@ +qwertyuiop From 18163a0ed534d3a85c4ca6e34c4e898460b1cf2e Mon Sep 17 00:00:00 2001 From: dzbaker Date: Fri, 14 Apr 2023 08:46:12 -0400 Subject: [PATCH 13/13] Create test2 --- test2 | 1 + 1 file changed, 1 insertion(+) create mode 100644 test2 diff --git a/test2 b/test2 new file mode 100644 index 000000000..ffeb732ff --- /dev/null +++ b/test2 @@ -0,0 +1 @@ +asdfghjkl