From 709eebea5b814e8f59354a5437948879355bfb84 Mon Sep 17 00:00:00 2001 From: Heliozoa Date: Mon, 9 Sep 2024 15:07:37 +0300 Subject: [PATCH 1/3] Use new upload action --- .github/workflows/windows.yml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index e03f5b1..b5bab3a 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -76,14 +76,10 @@ jobs: cargo install cargo-wix cargo wix --output installer.msi - name: Upload msi artifact - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ github.token }} + uses: svenstaro/upload-release-action@2.9.0 with: - upload_url: ${{ github.event.release.upload_url }} - asset_path: ./installer.msi - asset_name: tmc-cli-rust-${{ steps.get_version.outputs.VERSION }}.msi - asset_content_type: application/octet-stream + file: "./installer.msi" + asset_name: tmc-cli-rust-$tag.msi - name: Deploy run: | From 60030b42ca5578a3ea1a429318d3d07acff79884 Mon Sep 17 00:00:00 2001 From: Heliozoa Date: Mon, 9 Sep 2024 15:09:06 +0300 Subject: [PATCH 2/3] Use full versions of all actions --- .github/workflows/linux.yml | 8 ++++---- .github/workflows/macos.yml | 8 ++++---- .github/workflows/windows.yml | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index bccae0d..6cfb691 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -16,7 +16,7 @@ jobs: test: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v4.1.7 - name: Install fmt, clippy and nightly for the fmt run: | @@ -45,15 +45,15 @@ jobs: matrix: target: [i686-unknown-linux-gnu, x86_64-unknown-linux-gnu] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v4.1.7 - id: "auth" - uses: google-github-actions/auth@v2 + uses: google-github-actions/auth@v2.1.5 with: project_id: ${{ secrets.GCP_PROJECT_ID }} credentials_json: ${{ secrets.GCP_SA_KEY }} - name: "Set up Cloud SDK" - uses: google-github-actions/setup-gcloud@v2 + uses: google-github-actions/setup-gcloud@v2.1.1 - name: Install dependencies run: | diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 9f4c394..58dab18 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -16,7 +16,7 @@ jobs: test: runs-on: macos-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v4.1.7 - name: Install fmt and clippy run: | @@ -40,15 +40,15 @@ jobs: if: ${{ github.event_name == 'release' }} runs-on: macos-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v4.1.7 - id: "auth" - uses: google-github-actions/auth@v2 + uses: google-github-actions/auth@v2.1.5 with: project_id: ${{ secrets.GCP_PROJECT_ID }} credentials_json: ${{ secrets.GCP_SA_KEY }} - name: "Set up Cloud SDK" - uses: google-github-actions/setup-gcloud@v2 + uses: google-github-actions/setup-gcloud@v2.1.1 - name: Cargo build run: cargo build -p tmc --release --verbose diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index b5bab3a..99d5179 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -16,7 +16,7 @@ jobs: test: runs-on: windows-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v4.1.7 - name: Enable long paths for git run: git config --system core.longpaths true # allow long paths from git deps @@ -46,15 +46,15 @@ jobs: matrix: target: [i686-pc-windows-msvc, x86_64-pc-windows-msvc] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v4.1.7 - id: "auth" - uses: google-github-actions/auth@v2 + uses: google-github-actions/auth@v2.1.5 with: project_id: ${{ secrets.GCP_PROJECT_ID }} credentials_json: ${{ secrets.GCP_SA_KEY }} - name: "Set up Cloud SDK" - uses: google-github-actions/setup-gcloud@v2 + uses: google-github-actions/setup-gcloud@v2.1.1 - name: Enable long paths for git run: git config --system core.longpaths true # allow long paths from git deps From 3c0c2ee25b6d3370970082b2a8ee4a46213cde3e Mon Sep 17 00:00:00 2001 From: Heliozoa Date: Mon, 9 Sep 2024 15:16:15 +0300 Subject: [PATCH 3/3] Copy python version extraction from langs --- .github/workflows/windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 99d5179..a7b61ed 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -83,6 +83,6 @@ jobs: - name: Deploy run: | - $env:python_version=$(python -c 'import sys; print(\".\".join(map(str, sys.version_info[:3])))') + $env:python_version=$(python -c 'import sys; print(".".join(map(str, sys.version_info[:3])))') $env:CLOUDSDK_PYTHON="C:\hostedtoolcache\windows\Python\$env:python_version\x64\python" gsutil cp target/${{ matrix.target }}/release/tmc.exe gs://${{ secrets.GCP_BUCKET }}/tmc-cli-rust/tmc-cli-rust-${{ matrix.target }}-${{ steps.get_version.outputs.VERSION }}.exe