From bfeb390d691aee8d3f9c76efb6d50e527c3f1ace Mon Sep 17 00:00:00 2001 From: andig Date: Fri, 27 Sep 2024 17:57:11 +0200 Subject: [PATCH] Revert "chore: fix cloudsmith install" This reverts commit 7620c5fc5ceca1c2a92287e9cf803347e8aa06ad. --- .github/workflows/nightly.yml | 8 +++----- .github/workflows/release.yml | 8 +++----- Makefile | 4 ++-- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 4a8ee56e0..7ee5ecb6d 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -89,6 +89,9 @@ jobs: go-version: ${{ env.GO_VERSION }} id: go + - name: Install Cloudsmith CLI + run: pip install --upgrade cloudsmith-cli + - name: Patch ASN1 run: make patch-asn1-sudo @@ -108,11 +111,6 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} TESLA_CLIENT_ID: ${{ secrets.TESLA_CLIENT_ID }} - - name: Install Cloudsmith CLI - run: | - python3 -m venv venv - venv/bin/pip install --upgrade cloudsmith-cli - - name: Publish .deb to Cloudsmith env: CLOUDSMITH_API_KEY: ${{ secrets.CLOUDSMITH_API_KEY }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2e5d98704..c992aa03e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -68,6 +68,9 @@ jobs: go-version: ${{ env.GO_VERSION }} id: go + - name: Install Cloudsmith CLI + run: pip install --upgrade cloudsmith-cli + - name: Patch ASN1 run: make patch-asn1-sudo @@ -102,11 +105,6 @@ jobs: GITHUB_TOKEN: ${{ secrets.GH_TOKEN }} TESLA_CLIENT_ID: ${{ secrets.TESLA_CLIENT_ID }} - - name: Install Cloudsmith CLI - run: | - python3 -m venv venv - venv/bin/pip install --upgrade cloudsmith-cli - - name: Publish .deb to Cloudsmith env: CLOUDSMITH_API_KEY: ${{ secrets.CLOUDSMITH_API_KEY }} diff --git a/Makefile b/Makefile index b930ff2c8..28233cd95 100644 --- a/Makefile +++ b/Makefile @@ -96,12 +96,12 @@ publish-release:: apt-nightly:: $(foreach file, $(wildcard $(PACKAGES)/*.deb), \ - venv/bin/cloudsmith push deb evcc/unstable/any-distro/any-version $(file); \ + cloudsmith push deb evcc/unstable/any-distro/any-version $(file); \ ) apt-release:: $(foreach file, $(wildcard $(PACKAGES)/*.deb), \ - venv/bin/cloudsmith push deb evcc/stable/any-distro/any-version $(file); \ + cloudsmith push deb evcc/stable/any-distro/any-version $(file); \ ) # gokrazy image