Skip to content

Commit 00e0564

Browse files
authored
Merge pull request #14 from akmshasan/fix-workflow
Fix workflow
2 parents 0ec1fad + 593b7a9 commit 00e0564

File tree

2 files changed

+14
-40
lines changed

2 files changed

+14
-40
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,8 @@ jobs:
1919
uses: actions/checkout@v4
2020

2121
- name: Install Rust
22-
uses: actions-rs/toolchain@v1
22+
uses: dtolnay/rust-toolchain@stable
2323
with:
24-
toolchain: stable
25-
profile: minimal
26-
override: true
2724
components: rustfmt, clippy
2825

2926
- name: Install sccache
@@ -36,7 +33,7 @@ jobs:
3633
run: echo "RUSTC_WRAPPER=$HOME/.cargo/bin/sccache" >> $GITHUB_ENV
3734

3835
- name: Cache cargo registry
39-
uses: actions/cache@v3
36+
uses: actions/cache@v4
4037
with:
4138
path: |
4239
~/.cargo/registry
@@ -68,13 +65,10 @@ jobs:
6865
uses: actions/checkout@v4
6966

7067
- name: Install Rust
71-
uses: actions-rs/toolchain@v1
72-
with:
73-
toolchain: stable
74-
override: true
68+
uses: dtolnay/rust-toolchain@stable
7569

7670
- name: Cache cargo registry
77-
uses: actions/cache@v3
71+
uses: actions/cache@v4
7872
with:
7973
path: |
8074
~/.cargo/registry

.github/workflows/release.yml

Lines changed: 10 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -8,38 +8,26 @@ on:
88
env:
99
CARGO_TERM_COLOR: always
1010

11+
permissions:
12+
contents: write
13+
1114
jobs:
1215
create-release:
1316
name: Create Release
1417
runs-on: ubuntu-latest
15-
outputs:
16-
upload_url: ${{ steps.create_release.outputs.upload_url }}
17-
release_version: ${{ steps.get_version.outputs.version }}
1818

1919
steps:
2020
- name: Checkout code
2121
uses: actions/checkout@v4
2222

23-
- name: Install sccache
24-
run: cargo install sccache
25-
26-
- name: Add Cargo bin to PATH
27-
run: echo "$HOME/.cargo/bin" >> $GITHUB_PATH
28-
29-
- name: Set RUSTC_WRAPPER
30-
run: echo "RUSTC_WRAPPER=$HOME/.cargo/bin/sccache" >> $GITHUB_ENV
3123
- name: Get version from tag
3224
id: get_version
3325
run: echo "version=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
3426

3527
- name: Create Release
36-
id: create_release
37-
uses: actions/create-release@v1
38-
env:
39-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
28+
uses: softprops/action-gh-release@v1
4029
with:
41-
tag_name: ${{ github.ref }}
42-
release_name: Helmctl ${{ steps.get_version.outputs.version }}
30+
name: Helmctl ${{ steps.get_version.outputs.version }}
4331
body: |
4432
## Changes in ${{ steps.get_version.outputs.version }}
4533
@@ -67,7 +55,6 @@ jobs:
6755

6856
build-release:
6957
name: Build Release Binary
70-
needs: create-release
7158
runs-on: ${{ matrix.os }}
7259
strategy:
7360
matrix:
@@ -86,29 +73,22 @@ jobs:
8673
uses: actions/checkout@v4
8774

8875
- name: Install Rust
89-
uses: actions-rs/toolchain@v1
76+
uses: dtolnay/rust-toolchain@stable
9077
with:
91-
toolchain: stable
92-
target: ${{ matrix.target }}
93-
override: true
78+
targets: ${{ matrix.target }}
9479

9580
- name: Build release binary
9681
run: cargo build --release --target ${{ matrix.target }}
9782

9883
- name: Upload Release Asset
99-
uses: actions/upload-release-asset@v1
100-
env:
101-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
84+
uses: softprops/action-gh-release@v1
10285
with:
103-
upload_url: ${{ needs.create-release.outputs.upload_url }}
104-
asset_path: ./target/${{ matrix.target }}/release/${{ matrix.artifact_name }}
105-
asset_name: ${{ matrix.asset_name }}
106-
asset_content_type: application/octet-stream
86+
files: ./target/${{ matrix.target }}/release/${{ matrix.artifact_name }}
10787

10888
docker:
10989
name: Build and Push Docker Image
11090
runs-on: ubuntu-latest
111-
needs: [create-release, build-release]
91+
needs: create-release
11292
steps:
11393
- name: Checkout code
11494
uses: actions/checkout@v4

0 commit comments

Comments
 (0)