From 03ce80e68d44f380ae4c8c2ba472ca1d05447adb Mon Sep 17 00:00:00 2001 From: Matt Straathof <11823378+bruuuuuuuce@users.noreply.github.com> Date: Thu, 11 Apr 2024 15:50:14 -0700 Subject: [PATCH 1/7] fix: update actions to remove deprecated nodejs versions --- .github/workflows/on-pull-request.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/on-pull-request.yml b/.github/workflows/on-pull-request.yml index 878deb65..75794ea5 100644 --- a/.github/workflows/on-pull-request.yml +++ b/.github/workflows/on-pull-request.yml @@ -13,7 +13,7 @@ jobs: name: Style & Lint runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Install protoc run: ./scripts/install_protoc_linux.sh @@ -31,7 +31,7 @@ jobs: max-parallel: 1 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Install protoc run: ./scripts/install_protoc_linux.sh @@ -53,7 +53,7 @@ jobs: build-windows: runs-on: windows-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Install protoc run: choco install protoc From bdd1613e8274cb392ce6ed422f238a6fe8d0ccb4 Mon Sep 17 00:00:00 2001 From: Matt Straathof <11823378+bruuuuuuuce@users.noreply.github.com> Date: Thu, 11 Apr 2024 15:50:50 -0700 Subject: [PATCH 2/7] Update on-push-to-main.yml --- .github/workflows/on-push-to-main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/on-push-to-main.yml b/.github/workflows/on-push-to-main.yml index 758da355..7cba5642 100644 --- a/.github/workflows/on-push-to-main.yml +++ b/.github/workflows/on-push-to-main.yml @@ -13,7 +13,7 @@ jobs: name: Style & Lint runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Install protoc run: ./scripts/install_protoc_linux.sh @@ -29,7 +29,7 @@ jobs: max-parallel: 1 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Install protoc run: ./scripts/install_protoc_linux.sh @@ -48,7 +48,7 @@ jobs: build-windows: runs-on: windows-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Install protoc run: choco install protoc From 97bd22cf671b55fca47c4aed2a8479effef07631 Mon Sep 17 00:00:00 2001 From: Matt Straathof <11823378+bruuuuuuuce@users.noreply.github.com> Date: Fri, 12 Apr 2024 09:59:16 -0700 Subject: [PATCH 3/7] fix: use new set-output commands --- .github/workflows/execute-release.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/execute-release.yml b/.github/workflows/execute-release.yml index 68d1134d..a67dbcbf 100644 --- a/.github/workflows/execute-release.yml +++ b/.github/workflows/execute-release.yml @@ -54,7 +54,7 @@ jobs: - name: Output release id: release - run: echo "::set-output name=release::${{ steps.semrel.outputs.version }}" + run: echo "release=${{ steps.semrel.outputs.version }}" >> $GITHUB_OUTPUT publish-linux-assets: runs-on: ubuntu-latest @@ -282,9 +282,9 @@ jobs: rustup target add x86_64-pc-windows-gnu cargo build --release --target x86_64-pc-windows-gnu - echo "::set-output name=momento_binary_path::.\target\x86_64-pc-windows-gnu\release\momento.exe" + echo "momento_binary_path=.\target\x86_64-pc-windows-gnu\release\momento.exe" >> $GITHUB_OUTPUT $distributableFile64Prefix = "momento-cli-$env:VERSION.windows_x64" - echo "::set-output name=distributable_file_prefix::$distributableFile64Prefix" + echo "distributable_file_prefix=$distributableFile64Prefix" >> $GITHUB_OUTPUT - name: Write client auth certificate file id: write_client_auth_cert @@ -365,8 +365,8 @@ jobs: $zipPath = ".\$zipFilename" Compress-Archive -LiteralPath $env:MOMENTO_BINARY_PATH -DestinationPath $zipPath - echo "::set-output name=asset_path::$zipPath" - echo "::set-output name=asset_name::$zipFilename" + echo "asset_path=$zipPath" >> $GITHUB_OUTPUT + echo "asset_name=$zipFilename" >> $GITHUB_OUTPUT - name: Add msbuild to PATH uses: microsoft/setup-msbuild@v1.1 @@ -384,8 +384,8 @@ jobs: $msiFilename = "$env:DISTRIBUTABLE_FILE_PREFIX.msi" $msiPath = ".\windows\installer\bin\Release\$msiFilename" - echo "::set-output name=asset_path::$msiPath" - echo "::set-output name=asset_name::$msiFilename" + echo "asset_path=$msiPath" >> $GITHUB_OUTPUT + echo "asset_name=$msiFilename" >> $GITHUB_OUTPUT - name: Sign installer env: @@ -415,8 +415,8 @@ jobs: $releaseId = $latestRelease | jq -r .id $ghAssetMsi = "https://uploads.github.com/repos/momentohq/momento-cli/releases/$releaseId/assets?name=$env:MSI_FILENAME" $ghAssetZip = "https://uploads.github.com/repos/momentohq/momento-cli/releases/$releaseId/assets?name=$env:ZIP_FILENAME" - echo "::set-output name=upload_url_msi::$ghAssetMsi" - echo "::set-output name=upload_url_zip::$ghAssetZip" + echo "upload_url_msi=$ghAssetMsi" >> $GITHUB_OUTPUT + echo "upload_url_zip=$ghAssetZip" >> $GITHUB_OUTPUT - name: Upload windows_x64 msi uses: actions/upload-release-asset@v1 @@ -492,7 +492,7 @@ jobs: MSI_FILENAME: ${{ needs.publish-windows-assets.outputs.msi_filename }} run: | $installerUrl = "https://github.com/momentohq/momento-cli/releases/download/v$env:VERSION/$env:MSI_FILENAME" - echo "::set-output name=installer_url::$installerUrl" + echo "installer_url=$installerUrl" >> $GITHUB_OUTPUT - name: Open PR on WinGet env: From 18aacba36d650718e0efcd9ffa86faa8dd59c50a Mon Sep 17 00:00:00 2001 From: Matt Straathof <11823378+bruuuuuuuce@users.noreply.github.com> Date: Fri, 12 Apr 2024 10:02:25 -0700 Subject: [PATCH 4/7] chore: use actions-checkout@v4 --- .github/workflows/on-pull-request.yml | 6 +++--- .github/workflows/on-push-to-main.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/on-pull-request.yml b/.github/workflows/on-pull-request.yml index 75794ea5..1aa93a01 100644 --- a/.github/workflows/on-pull-request.yml +++ b/.github/workflows/on-pull-request.yml @@ -13,7 +13,7 @@ jobs: name: Style & Lint runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install protoc run: ./scripts/install_protoc_linux.sh @@ -31,7 +31,7 @@ jobs: max-parallel: 1 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install protoc run: ./scripts/install_protoc_linux.sh @@ -53,7 +53,7 @@ jobs: build-windows: runs-on: windows-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install protoc run: choco install protoc diff --git a/.github/workflows/on-push-to-main.yml b/.github/workflows/on-push-to-main.yml index 7cba5642..7f212f72 100644 --- a/.github/workflows/on-push-to-main.yml +++ b/.github/workflows/on-push-to-main.yml @@ -13,7 +13,7 @@ jobs: name: Style & Lint runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install protoc run: ./scripts/install_protoc_linux.sh @@ -29,7 +29,7 @@ jobs: max-parallel: 1 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install protoc run: ./scripts/install_protoc_linux.sh @@ -48,7 +48,7 @@ jobs: build-windows: runs-on: windows-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install protoc run: choco install protoc From 80cdcda5504a51a3eea1d915dc9121b23e9e55cb Mon Sep 17 00:00:00 2001 From: Matt Straathof <11823378+bruuuuuuuce@users.noreply.github.com> Date: Fri, 12 Apr 2024 10:09:01 -0700 Subject: [PATCH 5/7] fix: remove setup-rust step, rust comes prebuilt inside actions --- .github/workflows/on-pull-request.yml | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/.github/workflows/on-pull-request.yml b/.github/workflows/on-pull-request.yml index 1aa93a01..489db251 100644 --- a/.github/workflows/on-pull-request.yml +++ b/.github/workflows/on-pull-request.yml @@ -36,12 +36,6 @@ jobs: - name: Install protoc run: ./scripts/install_protoc_linux.sh - - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - components: rustfmt - override: true - - uses: Swatinem/rust-cache@v2 - name: Build @@ -58,10 +52,5 @@ jobs: - name: Install protoc run: choco install protoc - - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - components: rustfmt - override: true - name: Build run: cargo build --verbose From 29852ad64a52a23c36686b737f550cbeebf0ad75 Mon Sep 17 00:00:00 2001 From: Matt Straathof <11823378+bruuuuuuuce@users.noreply.github.com> Date: Fri, 12 Apr 2024 10:15:07 -0700 Subject: [PATCH 6/7] Update on-push-to-main.yml --- .github/workflows/on-push-to-main.yml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/.github/workflows/on-push-to-main.yml b/.github/workflows/on-push-to-main.yml index 7f212f72..b4ab0835 100644 --- a/.github/workflows/on-push-to-main.yml +++ b/.github/workflows/on-push-to-main.yml @@ -34,11 +34,6 @@ jobs: - name: Install protoc run: ./scripts/install_protoc_linux.sh - - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - components: rustfmt - override: true - name: Build run: cargo build --verbose @@ -53,11 +48,6 @@ jobs: - name: Install protoc run: choco install protoc - - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - components: rustfmt - override: true - name: Build run: cargo build --verbose From 0620053163fa6e1aa0739ac1e29e500c1a87b780 Mon Sep 17 00:00:00 2001 From: Matt Straathof <11823378+bruuuuuuuce@users.noreply.github.com> Date: Fri, 12 Apr 2024 10:19:55 -0700 Subject: [PATCH 7/7] Update execute-release.yml --- .github/workflows/execute-release.yml | 32 +++++---------------------- 1 file changed, 5 insertions(+), 27 deletions(-) diff --git a/.github/workflows/execute-release.yml b/.github/workflows/execute-release.yml index a67dbcbf..62b06107 100644 --- a/.github/workflows/execute-release.yml +++ b/.github/workflows/execute-release.yml @@ -17,7 +17,7 @@ jobs: outputs: version: ${{ steps.release.outputs.release }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: semrel release id: semrel @@ -65,7 +65,7 @@ jobs: - { target: aarch64-unknown-linux-gnu, rpm-arch-shortname: aarch64, deb-arch-shortname: arm64, os: ubuntu-20.04, use-cross: true } - { target: x86_64-unknown-linux-gnu, rpm-arch-shortname: x86_64, deb-arch-shortname: amd64, os: ubuntu-20.04, use-cross: true } steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install protoc run: ./scripts/install_protoc_linux.sh @@ -77,14 +77,6 @@ jobs: aarch64-unknown-linux-gnu) sudo apt-get -y update ; sudo apt-get -y install gcc-aarch64-linux-gnu ;; esac - - name: Install Rust toolchain - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - target: ${{ matrix.architecture.target }} - override: true - profile: minimal # minimal component installation (ie, no documentation) - - name: Show version information (Rust, cargo, GCC) shell: bash run: | @@ -193,19 +185,11 @@ jobs: - { target: aarch64-apple-darwin, use-cross: true } steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install protoc run: ./scripts/install_protoc_osx.sh - - name: Install Rust toolchain - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - target: ${{ matrix.architecture.target }} - override: true - profile: minimal # minimal component installation (ie, no documentation) - - name: Show version information (Rust, cargo, GCC) shell: bash run: | @@ -253,7 +237,7 @@ jobs: outputs: msi_filename: ${{ steps.build_installer.outputs.asset_name }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install protoc run: choco install protoc @@ -263,12 +247,6 @@ jobs: with: python-version: "3.x" - - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - components: rustfmt - override: true - - name: Show Cargo Version run: | cat Cargo.toml @@ -507,7 +485,7 @@ jobs: steps: - name: Check out homebrew-tap - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 repository: momentohq/homebrew-tap