From 44b40fa09225be95747053ed1fd5c2182fd902ae Mon Sep 17 00:00:00 2001 From: "K.B.Dharun Krishna" Date: Tue, 29 Apr 2025 23:57:12 +0530 Subject: [PATCH 1/2] cleanup: update workflows, bump snap version Signed-off-by: K.B.Dharun Krishna --- .github/workflows/publish.yml | 2 +- .github/workflows/test.yml | 5 +---- snap/snapcraft.yaml | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 85c5c10..61a01f5 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -1,4 +1,4 @@ -# This workflow will upload a Python Package using Trusted Publishers automatically when a release is created +# This workflow will upload a Python Package using Trusted Publishers automatically when a release is created and the deployment is approved by an admin # For more information see: https://help.github.com/en/actions/language-and-framework-guides/using-python-with-github-actions#publishing-to-package-registries # and https://docs.pypi.org/trusted-publishers/using-a-publisher/. diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index be5fa63..b47b20d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -97,7 +97,6 @@ jobs: run: | python3 -m pip install . tldr --version - tldr tldr --markdown build-windows: runs-on: windows-latest @@ -144,7 +143,6 @@ jobs: run: | python3 -m pip install . tldr --version - tldr tldr --markdown build-windows-arm: runs-on: windows-11-arm @@ -183,11 +181,10 @@ jobs: run: | python3 -m pip install . tldr --version - tldr tldr --markdown build-snap: runs-on: ${{ matrix.os }} - if: github.repository == 'tldr-pages/tldr-python-client' && github.ref == 'refs/heads/main' + if: github.repository == 'tldr-pages/tldr-python-client' && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/')) needs: ['build-linux'] permissions: diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 85b4cec..6712931 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -1,6 +1,6 @@ name: tldr base: core24 -version: '3.4.0' +version: '3.4.1' summary: tldr python client description: Official Python command-line client for tldr pages. From c519fa1a1d28ea64a4f43d863c3459793061f77c Mon Sep 17 00:00:00 2001 From: "K.B.Dharun Krishna" Date: Wed, 30 Apr 2025 00:09:33 +0530 Subject: [PATCH 2/2] fix: make jobs runs one after another Signed-off-by: K.B.Dharun Krishna --- .github/workflows/test.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b47b20d..8566344 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -49,10 +49,10 @@ jobs: run: | python3 -m pip install . tldr --version - tldr tldr --markdown build-macos: runs-on: macos-latest + needs: ['build-linux'] permissions: contents: read @@ -100,6 +100,7 @@ jobs: build-windows: runs-on: windows-latest + needs: ['build-macos'] permissions: contents: read @@ -146,6 +147,7 @@ jobs: build-windows-arm: runs-on: windows-11-arm + needs: ['build-windows'] permissions: contents: read