From 4c6ad103f97ce178db0a79f367bbae6084c6c405 Mon Sep 17 00:00:00 2001 From: TerminalFi Date: Sun, 11 Jun 2023 15:54:23 -0500 Subject: [PATCH 1/4] fix workflow. Also test before merge :D --- .github/workflows/gopls_update_check.yaml | 4 +++- scripts/compare_tags.py | 9 +++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/gopls_update_check.yaml b/.github/workflows/gopls_update_check.yaml index 4b96afa..312d3cd 100644 --- a/.github/workflows/gopls_update_check.yaml +++ b/.github/workflows/gopls_update_check.yaml @@ -34,7 +34,9 @@ jobs: check-latest: true cache: true - name: Install GOPLS - run: go install "golang.org/x/tools/gopls@v${{ needs.compareTag.outputs.latest_tag }}" + run: | + export VERSION=${{ needs.compareTag.outputs.latest_tag }} + go install "golang.org/x/tools/gopls@v$VERSION" - uses: actions/setup-python@v4 - name: Update VERSION run: | diff --git a/scripts/compare_tags.py b/scripts/compare_tags.py index b28df61..3ee04dc 100644 --- a/scripts/compare_tags.py +++ b/scripts/compare_tags.py @@ -30,10 +30,11 @@ def get_latest_version(self, tags: list) -> str: print("[get_latest_version] Regex match failed. Could not find latest version from tags.") exit(1) - if len(version.groups()) == 2 and version.group(2) is not None: - print(f"Found latest version: {version.group(1)}-{version.group(2)}") - print("Latest version appears to be a pre-release. Skipping.") - exit(0) + if version.group(2) is not None: + print(f'[get_latest_version] Version is {version.group(1)}-{version.group(2)}') + return f'{version.group(1)}-{version.group(2)}' + + print(f'[get_latest_version] Version is {version.group(1)}') return version.group(1) print("[get_latest_version] Could not find latest version from tags.") exit(1) From 677d0a14c80386ae94ce19b0c50e9d961ca5f3e9 Mon Sep 17 00:00:00 2001 From: TerminalFi Date: Sun, 11 Jun 2023 15:56:12 -0500 Subject: [PATCH 2/4] echo version to log --- .github/workflows/gopls_update_check.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/gopls_update_check.yaml b/.github/workflows/gopls_update_check.yaml index 312d3cd..089bb50 100644 --- a/.github/workflows/gopls_update_check.yaml +++ b/.github/workflows/gopls_update_check.yaml @@ -35,6 +35,7 @@ jobs: cache: true - name: Install GOPLS run: | + echo "VERSION = '${{ needs.compareTag.outputs.latest_tag }}'" export VERSION=${{ needs.compareTag.outputs.latest_tag }} go install "golang.org/x/tools/gopls@v$VERSION" - uses: actions/setup-python@v4 From 92155ee6e157bd58480f2ef2928f66f6dd564bda Mon Sep 17 00:00:00 2001 From: TerminalFi Date: Sun, 11 Jun 2023 16:03:19 -0500 Subject: [PATCH 3/4] fix env --- .github/workflows/gopls_update_check.yaml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/gopls_update_check.yaml b/.github/workflows/gopls_update_check.yaml index 089bb50..f2ddb9a 100644 --- a/.github/workflows/gopls_update_check.yaml +++ b/.github/workflows/gopls_update_check.yaml @@ -9,7 +9,7 @@ jobs: compareTag: runs-on: ubuntu-latest outputs: - latest_tag: ${{ steps.tagCompare.outputs.LATEST_TAG }} + latest_tag: ${{ steps.tagCompare.outputs.LATEST_VERSION }} requires_update: ${{ steps.tagCompare.outputs.REQUIRES_UPDATE }} branch_name: ${{ steps.tagCompare.outputs.BRANCH_NAME }} steps: @@ -35,9 +35,7 @@ jobs: cache: true - name: Install GOPLS run: | - echo "VERSION = '${{ needs.compareTag.outputs.latest_tag }}'" - export VERSION=${{ needs.compareTag.outputs.latest_tag }} - go install "golang.org/x/tools/gopls@v$VERSION" + go install "golang.org/x/tools/gopls@v${{ needs.compareTag.outputs.latest_tag }} - uses: actions/setup-python@v4 - name: Update VERSION run: | From 2d014d38d35cb9b89caab303e992b154ea08a42b Mon Sep 17 00:00:00 2001 From: TerminalFi Date: Sun, 11 Jun 2023 16:05:18 -0500 Subject: [PATCH 4/4] fix quote --- .github/workflows/gopls_update_check.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gopls_update_check.yaml b/.github/workflows/gopls_update_check.yaml index f2ddb9a..4b5cbb4 100644 --- a/.github/workflows/gopls_update_check.yaml +++ b/.github/workflows/gopls_update_check.yaml @@ -35,7 +35,7 @@ jobs: cache: true - name: Install GOPLS run: | - go install "golang.org/x/tools/gopls@v${{ needs.compareTag.outputs.latest_tag }} + go install golang.org/x/tools/gopls@v${{ needs.compareTag.outputs.latest_tag }} - uses: actions/setup-python@v4 - name: Update VERSION run: |