From 1fc490da752c4d1388d0077fc709cfe2d18ac2bd Mon Sep 17 00:00:00 2001 From: Will Xu Date: Thu, 1 Jun 2023 21:22:35 -0400 Subject: [PATCH 01/31] Remove PR Actions Run, Add Tag Actions Run --- .github/workflows/main.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1d597153..ed39c8d7 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,8 +1,10 @@ name: Build PROS CLI +# Controls when the action will run. Triggers the workflow on push or tag on: push: - pull_request: + tag: + - '*' jobs: update_build_number: From eb14bfcde8ac85fed5bc3c0c3029c4050d1713ca Mon Sep 17 00:00:00 2001 From: Will Xu Date: Thu, 1 Jun 2023 21:24:53 -0400 Subject: [PATCH 02/31] Remove comment --- .github/workflows/main.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ed39c8d7..77ab73bb 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,6 +1,5 @@ name: Build PROS CLI -# Controls when the action will run. Triggers the workflow on push or tag on: push: tag: From 7d5ce94e5a50c02228e3155ebca10d0aa5b55de2 Mon Sep 17 00:00:00 2001 From: Will Xu Date: Thu, 1 Jun 2023 21:25:42 -0400 Subject: [PATCH 03/31] Fix tags spelling --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 77ab73bb..7f234748 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -2,7 +2,7 @@ name: Build PROS CLI on: push: - tag: + tags: - '*' jobs: From b46aad6e6411b390f416d17d938038fdbf560326 Mon Sep 17 00:00:00 2001 From: Will Xu Date: Thu, 1 Jun 2023 21:26:40 -0400 Subject: [PATCH 04/31] Indented --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7f234748..0e359528 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -2,8 +2,8 @@ name: Build PROS CLI on: push: - tags: - - '*' + tags: + - '*' jobs: update_build_number: From 32edd93b9585818b426cdd8327ac9d8da864d7a1 Mon Sep 17 00:00:00 2001 From: Will Xu Date: Thu, 1 Jun 2023 21:44:45 -0400 Subject: [PATCH 05/31] Add all branches --- .github/workflows/main.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0e359528..242ff933 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,9 +1,12 @@ name: Build PROS CLI on: + # make github actions run on every push and every tag push: tags: - '*' + branches: + - '**' jobs: update_build_number: From 20d51d62278f0a3ec17a66d465820ae02bd804a6 Mon Sep 17 00:00:00 2001 From: Will Xu Date: Sat, 3 Jun 2023 05:57:58 -0400 Subject: [PATCH 06/31] Attempting to fix tags --- .github/workflows/main.yml | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 242ff933..fb43c584 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -90,8 +90,12 @@ jobs: mv intercept-cc pros mv intercept-c++ pros - - name: Upload Artifact - uses: actions/upload-artifact@v3.1.0 - with: - name: ${{ matrix.os }}-${{needs.update_build_number.outputs.output1}} - path: dist/* + - name: Set Artifact Name + run: echo ::set-output name=artifact_name::${{ startsWith(github.ref, 'refs/tags/') && matrix.os + '-' + github.ref || matrix.os + '-commit' }} + if: startsWith(github.ref, 'refs/tags/') || github.event_name == 'push' + + - name: Upload Artifact + uses: actions/upload-artifact@v3.1.0 + with: + name: ${{ steps.set_artifact_name.outputs.artifact_name }} + path: dist/* From ba23719ee5ba6e342eae7875f81115e0426b1d9b Mon Sep 17 00:00:00 2001 From: Will Xu Date: Sat, 3 Jun 2023 06:00:31 -0400 Subject: [PATCH 07/31] Fix attempt 2 --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index fb43c584..1b489410 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -91,6 +91,7 @@ jobs: mv intercept-c++ pros - name: Set Artifact Name + id: set_artifact_name run: echo ::set-output name=artifact_name::${{ startsWith(github.ref, 'refs/tags/') && matrix.os + '-' + github.ref || matrix.os + '-commit' }} if: startsWith(github.ref, 'refs/tags/') || github.event_name == 'push' From 95834838c540ae95d1368ede7ff6c3ebe38e7817 Mon Sep 17 00:00:00 2001 From: Will Xu Date: Sat, 3 Jun 2023 06:09:19 -0400 Subject: [PATCH 08/31] Throwing at the wall and seeing if it sticks --- .github/workflows/main.yml | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1b489410..efb139bc 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -90,13 +90,8 @@ jobs: mv intercept-cc pros mv intercept-c++ pros - - name: Set Artifact Name - id: set_artifact_name - run: echo ::set-output name=artifact_name::${{ startsWith(github.ref, 'refs/tags/') && matrix.os + '-' + github.ref || matrix.os + '-commit' }} - if: startsWith(github.ref, 'refs/tags/') || github.event_name == 'push' - - - name: Upload Artifact - uses: actions/upload-artifact@v3.1.0 - with: - name: ${{ steps.set_artifact_name.outputs.artifact_name }} - path: dist/* + - name: Upload Artifact + uses: actions/upload-artifact@v3.1.0 + with: + name: ${{ matrix.os }}-${{needs.update_build_number.outputs.output1}}${{ github.ref_type == 'tag' && github.sha != github.ref ? '' : '-commit+' + github.sha }} + path: dist/* From a81719389f6f6808d26427c3782dcabc5ab226a1 Mon Sep 17 00:00:00 2001 From: Will Xu Date: Sat, 3 Jun 2023 06:20:23 -0400 Subject: [PATCH 09/31] reee --- .github/workflows/main.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index efb139bc..cf068f7b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -22,6 +22,7 @@ jobs: run: | python3 version.py echo "::set-output name=test::$(cat version)" + if: github.ref_type != 'tag' build: needs: update_build_number @@ -93,5 +94,5 @@ jobs: - name: Upload Artifact uses: actions/upload-artifact@v3.1.0 with: - name: ${{ matrix.os }}-${{needs.update_build_number.outputs.output1}}${{ github.ref_type == 'tag' && github.sha != github.ref ? '' : '-commit+' + github.sha }} + name: ${{ matrix.os }}-${{needs.update_build_number.outputs.output1}} path: dist/* From 83455f7f5163e5086061b4dfce804e59a0751d29 Mon Sep 17 00:00:00 2001 From: Will Xu Date: Sat, 3 Jun 2023 06:24:06 -0400 Subject: [PATCH 10/31] Fix deprecation warning --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index cf068f7b..3173536a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -21,7 +21,7 @@ jobs: id: step1 run: | python3 version.py - echo "::set-output name=test::$(cat version)" + echo "test=$(cat version)" >> $GITHUB_ENV if: github.ref_type != 'tag' build: From 6238ad38c79e2e71f9acda0930b56363edf0ebff Mon Sep 17 00:00:00 2001 From: Will Xu Date: Sat, 3 Jun 2023 06:24:28 -0400 Subject: [PATCH 11/31] Fix statement properly --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3173536a..39a9bb90 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -21,7 +21,7 @@ jobs: id: step1 run: | python3 version.py - echo "test=$(cat version)" >> $GITHUB_ENV + echo "test=$(cat version)" >> $GITHUB_OUTPUT if: github.ref_type != 'tag' build: From 781b0b27803aa1713c93708bb263b6d07df59c37 Mon Sep 17 00:00:00 2001 From: Will Xu Date: Sat, 3 Jun 2023 06:36:14 -0400 Subject: [PATCH 12/31] Add new job for the tag --- .github/workflows/main.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 39a9bb90..a47bc23b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -24,6 +24,20 @@ jobs: echo "test=$(cat version)" >> $GITHUB_OUTPUT if: github.ref_type != 'tag' + update_build_number_tag: + runs-on: ubuntu-latest + outputs: + output1: ${{ steps.step1.outputs.test }} + steps: + - uses: actions/checkout@v3.1.0 + with: + fetch-depth: 0 + - name: Update Build Number + id: step1 + run: | + echo "test=$(cat version)" >> $GITHUB_OUTPUT + if: github.ref_type == 'tag' + build: needs: update_build_number runs-on: ${{ matrix.os }} From 6344d17fcad133413b6c22e5e7d8877abb170bf3 Mon Sep 17 00:00:00 2001 From: Will Xu Date: Sat, 3 Jun 2023 06:42:25 -0400 Subject: [PATCH 13/31] What I meant to do --- .github/workflows/main.yml | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a47bc23b..079d18d1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -23,17 +23,8 @@ jobs: python3 version.py echo "test=$(cat version)" >> $GITHUB_OUTPUT if: github.ref_type != 'tag' - - update_build_number_tag: - runs-on: ubuntu-latest - outputs: - output1: ${{ steps.step1.outputs.test }} - steps: - - uses: actions/checkout@v3.1.0 - with: - fetch-depth: 0 - name: Update Build Number - id: step1 + id: step2 run: | echo "test=$(cat version)" >> $GITHUB_OUTPUT if: github.ref_type == 'tag' From 7313a4927ea03ab5d7c2aac02b5bc5ba9f04de8d Mon Sep 17 00:00:00 2001 From: Will Xu Date: Sat, 3 Jun 2023 06:53:47 -0400 Subject: [PATCH 14/31] Fix actual tag generation --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 079d18d1..5159e360 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -23,10 +23,10 @@ jobs: python3 version.py echo "test=$(cat version)" >> $GITHUB_OUTPUT if: github.ref_type != 'tag' - - name: Update Build Number + - name: Update Build Number (Tag Only) id: step2 run: | - echo "test=$(cat version)" >> $GITHUB_OUTPUT + echo "test=${{ github.ref }}" >> $GITHUB_OUTPUT if: github.ref_type == 'tag' build: From 6412dc6ebaa1ebe26dd123cc109200a63f337d05 Mon Sep 17 00:00:00 2001 From: Will Xu Date: Sat, 3 Jun 2023 06:55:41 -0400 Subject: [PATCH 15/31] Fix tabbing --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5159e360..f577e397 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -26,7 +26,7 @@ jobs: - name: Update Build Number (Tag Only) id: step2 run: | - echo "test=${{ github.ref }}" >> $GITHUB_OUTPUT + echo "test=${{ github.ref }}" >> $GITHUB_OUTPUT if: github.ref_type == 'tag' build: From f8c9b112e2f2416dcd23a77d638995738d6f1e28 Mon Sep 17 00:00:00 2001 From: Will Xu Date: Sat, 3 Jun 2023 07:05:18 -0400 Subject: [PATCH 16/31] Sanity check --- .github/workflows/main.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f577e397..667c99fe 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -22,12 +22,7 @@ jobs: run: | python3 version.py echo "test=$(cat version)" >> $GITHUB_OUTPUT - if: github.ref_type != 'tag' - - name: Update Build Number (Tag Only) - id: step2 - run: | - echo "test=${{ github.ref }}" >> $GITHUB_OUTPUT - if: github.ref_type == 'tag' + build: needs: update_build_number From 2e7a2185f4a2e5c9ba42e5fb3ae4ebd10ddddd49 Mon Sep 17 00:00:00 2001 From: Will Xu Date: Sat, 3 Jun 2023 07:15:53 -0400 Subject: [PATCH 17/31] Sanity fix? --- .github/workflows/main.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 667c99fe..77184a77 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -21,8 +21,13 @@ jobs: id: step1 run: | python3 version.py - echo "test=$(cat version)" >> $GITHUB_OUTPUT - + echo "::set-output name=test::$(cat version)" + if: github.ref_type != 'tag' + - name: Update Build Number (Tag Only) + id: step2 + run: | + # echo "::set-output name=test::$(github.ref)" + if: github.ref_type == 'tag' build: needs: update_build_number From c25a8d63128c71b8a1d370fc2bb78566643a1bc4 Mon Sep 17 00:00:00 2001 From: Will Xu Date: Sat, 3 Jun 2023 07:19:45 -0400 Subject: [PATCH 18/31] re sanity check --- .github/workflows/main.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 77184a77..242ff933 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -22,12 +22,6 @@ jobs: run: | python3 version.py echo "::set-output name=test::$(cat version)" - if: github.ref_type != 'tag' - - name: Update Build Number (Tag Only) - id: step2 - run: | - # echo "::set-output name=test::$(github.ref)" - if: github.ref_type == 'tag' build: needs: update_build_number From 44d56cd6940ea7f55121aa26f12deb7b70a2ab8e Mon Sep 17 00:00:00 2001 From: Will Xu Date: Sat, 3 Jun 2023 07:24:10 -0400 Subject: [PATCH 19/31] Sanity check check --- .github/workflows/main.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 242ff933..d9bf4145 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -20,8 +20,14 @@ jobs: - name: Update Build Number id: step1 run: | - python3 version.py + #python3 version.py echo "::set-output name=test::$(cat version)" + if: github.ref_type != 'tag' + - name: Update Build Number (Tag Only) + id: step2 + run: | + echo "::set-output name=test::$(github.ref)" + if: github.ref_type == 'tag' build: needs: update_build_number From 5681bf2f308e2b89effe3f08ac4a352ba7f06b81 Mon Sep 17 00:00:00 2001 From: Will Xu Date: Sat, 3 Jun 2023 07:28:02 -0400 Subject: [PATCH 20/31] OK PLEASE WORK --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d9bf4145..9a41bb5f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -20,7 +20,7 @@ jobs: - name: Update Build Number id: step1 run: | - #python3 version.py + python3 version.py echo "::set-output name=test::$(cat version)" if: github.ref_type != 'tag' - name: Update Build Number (Tag Only) From 17632a81c70afd262a71c2299cc9eff380d47d28 Mon Sep 17 00:00:00 2001 From: Will Xu Date: Sat, 3 Jun 2023 07:48:55 -0400 Subject: [PATCH 21/31] Back to the "throw stuff at the wall" approach --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9a41bb5f..7469a19b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -21,12 +21,12 @@ jobs: id: step1 run: | python3 version.py - echo "::set-output name=test::$(cat version)" + echo "test=$(cat version)" >> $GITHUB_OUTPUT if: github.ref_type != 'tag' - name: Update Build Number (Tag Only) id: step2 run: | - echo "::set-output name=test::$(github.ref)" + echo "test=$(cat version)" >> $GITHUB_OUTPUT if: github.ref_type == 'tag' build: From 6942425095bd8d1ecdde83d9360368399b234053 Mon Sep 17 00:00:00 2001 From: Will Xu Date: Sat, 3 Jun 2023 07:58:08 -0400 Subject: [PATCH 22/31] Attempt to fix tag --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7469a19b..fa18c344 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -26,7 +26,7 @@ jobs: - name: Update Build Number (Tag Only) id: step2 run: | - echo "test=$(cat version)" >> $GITHUB_OUTPUT + steps.step1.outputs.test = github.ref if: github.ref_type == 'tag' build: From e0360840312670802951dd05a1146ff63b3dad86 Mon Sep 17 00:00:00 2001 From: Will Xu Date: Sat, 3 Jun 2023 08:01:42 -0400 Subject: [PATCH 23/31] Try again --- .github/workflows/main.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index fa18c344..498ab660 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -26,9 +26,8 @@ jobs: - name: Update Build Number (Tag Only) id: step2 run: | - steps.step1.outputs.test = github.ref + echo "test=${{ github.ref }}" >> $GITHUB_ENV if: github.ref_type == 'tag' - build: needs: update_build_number runs-on: ${{ matrix.os }} From 9fe14947b603d3cbfa4aeeb6be3878ee1e21517a Mon Sep 17 00:00:00 2001 From: Will Xu Date: Sat, 3 Jun 2023 08:02:26 -0400 Subject: [PATCH 24/31] add back newline --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 498ab660..bb93e44f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -28,6 +28,7 @@ jobs: run: | echo "test=${{ github.ref }}" >> $GITHUB_ENV if: github.ref_type == 'tag' + build: needs: update_build_number runs-on: ${{ matrix.os }} From cdfe4b5489b99f75c426ff0729edc57874736310 Mon Sep 17 00:00:00 2001 From: Will Xu Date: Sat, 3 Jun 2023 15:07:06 -0400 Subject: [PATCH 25/31] Attempt fix --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index bb93e44f..f577e397 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -26,9 +26,9 @@ jobs: - name: Update Build Number (Tag Only) id: step2 run: | - echo "test=${{ github.ref }}" >> $GITHUB_ENV + echo "test=${{ github.ref }}" >> $GITHUB_OUTPUT if: github.ref_type == 'tag' - + build: needs: update_build_number runs-on: ${{ matrix.os }} From aeb372f029e7c2e9a2020c8e8f9db6b2fac0e859 Mon Sep 17 00:00:00 2001 From: Will Xu Date: Sat, 3 Jun 2023 15:19:56 -0400 Subject: [PATCH 26/31] ATTEMPT FIX AGAIN --- .github/workflows/main.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f577e397..dff1658f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -26,7 +26,8 @@ jobs: - name: Update Build Number (Tag Only) id: step2 run: | - echo "test=${{ github.ref }}" >> $GITHUB_OUTPUT + ${{ github.ref }} > version + echo "test=$(cat version)" >> $GITHUB_OUTPUT if: github.ref_type == 'tag' build: From 9b69f2ef4a821adc1eb39961f00680a7aa654cb7 Mon Sep 17 00:00:00 2001 From: Will Xu Date: Sat, 3 Jun 2023 15:27:38 -0400 Subject: [PATCH 27/31] Attempt the same thing but with the actual name of ref --- .github/workflows/main.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index dff1658f..7758a164 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -26,8 +26,7 @@ jobs: - name: Update Build Number (Tag Only) id: step2 run: | - ${{ github.ref }} > version - echo "test=$(cat version)" >> $GITHUB_OUTPUT + echo "test=${{ github.ref_name }}" >> $GITHUB_OUTPUT if: github.ref_type == 'tag' build: From e150a9457140de6f55d43f98314253b0f706e741 Mon Sep 17 00:00:00 2001 From: Will Xu Date: Sat, 3 Jun 2023 15:34:46 -0400 Subject: [PATCH 28/31] Debug print --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7758a164..4fbb84cc 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -27,6 +27,7 @@ jobs: id: step2 run: | echo "test=${{ github.ref_name }}" >> $GITHUB_OUTPUT + echo $GITHUB_OUTPUT if: github.ref_type == 'tag' build: From 2c6754d85fc713997db62486855587be2b0b6589 Mon Sep 17 00:00:00 2001 From: Will Xu Date: Sun, 4 Jun 2023 00:21:16 -0400 Subject: [PATCH 29/31] Disable redundant version.py call --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4fbb84cc..c4fd5fc8 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -73,7 +73,7 @@ jobs: - name: Run Pyinstaller run: | - python3 version.py + # python3 version.py pyinstaller pros.spec pyinstaller --onefile pros/cli/compile_commands/intercept-cc.py --name=intercept-cc pyinstaller --onefile pros/cli/compile_commands/intercept-cc.py --name=intercept-c++ @@ -84,7 +84,7 @@ jobs: pip3 uninstall -y charset_normalizer git clone https://github.com/Ousret/charset_normalizer.git pip3 install -e ./charset_normalizer - python3 version.py + # python3 version.py pyinstaller pros-macos.spec pyinstaller --onefile pros/cli/compile_commands/intercept-cc.py --name=intercept-cc --target-arch=universal2 pyinstaller --onefile pros/cli/compile_commands/intercept-cc.py --name=intercept-c++ --target-arch=universal2 From 6d9e0c349d18ed4cc1c6abe50cf8953b34a0849a Mon Sep 17 00:00:00 2001 From: Will Xu Date: Sun, 4 Jun 2023 00:30:49 -0400 Subject: [PATCH 30/31] Try a different approach --- .github/workflows/main.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c4fd5fc8..b9d7c782 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -23,12 +23,6 @@ jobs: python3 version.py echo "test=$(cat version)" >> $GITHUB_OUTPUT if: github.ref_type != 'tag' - - name: Update Build Number (Tag Only) - id: step2 - run: | - echo "test=${{ github.ref_name }}" >> $GITHUB_OUTPUT - echo $GITHUB_OUTPUT - if: github.ref_type == 'tag' build: needs: update_build_number @@ -102,3 +96,10 @@ jobs: with: name: ${{ matrix.os }}-${{needs.update_build_number.outputs.output1}} path: dist/* + if: matrix.os != 'macos-latest' + - name: Upload Artifact (Tagged Version Naming) + uses: actions/upload-artifact@v3.1.0 + with: + name: ${{ matrix.os }}-${{github.ref_name}} + path: dist/* + if: github.ref_type == 'tag' From fa7b82b1c267d58a69d3b1068947cfedeec8d60a Mon Sep 17 00:00:00 2001 From: Ayush Shukla Date: Sat, 3 Jun 2023 22:20:06 -0700 Subject: [PATCH 31/31] update versions --- pip_version | 2 +- version | 2 +- win_version | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pip_version b/pip_version index a423d421..6cb9d3dd 100644 --- a/pip_version +++ b/pip_version @@ -1 +1 @@ -3.4.2 \ No newline at end of file +3.4.3 diff --git a/version b/version index a423d421..6cb9d3dd 100644 --- a/version +++ b/version @@ -1 +1 @@ -3.4.2 \ No newline at end of file +3.4.3 diff --git a/win_version b/win_version index 0ccc3dcd..03f59952 100644 --- a/win_version +++ b/win_version @@ -1 +1 @@ -3.4.2.0 \ No newline at end of file +3.4.3.0