Skip to content

Commit 05836d4

Browse files
Merge pull request #28 from nais/mise
Replace asdf with mise
2 parents fa8c92a + 8540f9a commit 05836d4

File tree

5 files changed

+16
-29
lines changed

5 files changed

+16
-29
lines changed

.github/workflows/main.yaml

+3-13
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,7 @@ jobs:
1818
runs-on: ubuntu-latest
1919
steps:
2020
- uses: actions/checkout@v4
21-
- uses: asdf-vm/actions/setup@v3
22-
- id: asdf-cache
23-
uses: actions/cache@v4
24-
with:
25-
path: ~/.asdf/
26-
key: ${{ runner.os }}-asdf-${{ hashFiles('**/.tool-versions') }}
27-
- uses: asdf-vm/actions/install@v3
28-
if: steps.asdf-cache.outputs.cache-hit != 'true'
29-
with:
30-
before_install: |
31-
asdf install golang latest
32-
asdf global golang latest
21+
- uses: jdx/mise-action@v2
3322
- name: Find go cache dir
3423
id: go-cache
3524
run: |
@@ -54,7 +43,7 @@ jobs:
5443
make generate
5544
git diff --exit-code --name-only
5645
- id: go_version
57-
run: echo "go_version=$(asdf current golang | awk '{print $2}')" >> $GITHUB_OUTPUT
46+
run: echo "go_version=$(mise current go)" >> $GITHUB_OUTPUT
5847
- uses: nais/platform-build-push-sign@main
5948
id: build-push-sign
6049
with:
@@ -91,6 +80,7 @@ jobs:
9180
chart="${{ steps.package_chart.outputs.archive }}"
9281
echo "Pushing: $chart"
9382
helm push "$chart" ${{ env.IMAGE_REPOSITORY }}
83+
9484
rollout:
9585
runs-on: fasit-deploy
9686
permissions:

.github/workflows/pr.yaml

+5-13
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,7 @@ jobs:
99
runs-on: ubuntu-latest
1010
steps:
1111
- uses: actions/checkout@v4
12-
- uses: asdf-vm/actions/setup@v3
13-
- id: asdf-cache
14-
uses: actions/cache@v4
15-
with:
16-
path: ~/.asdf/
17-
key: ${{ runner.os }}-asdf-${{ hashFiles('**/.tool-versions') }}
18-
- uses: asdf-vm/actions/install@v3
19-
if: steps.asdf-cache.outputs.cache-hit != 'true'
20-
with:
21-
before_install: |
22-
asdf install golang latest
23-
asdf global golang latest
12+
- uses: jdx/mise-action@v2
2413
- name: Find go cache dir
2514
id: go-cache
2615
run: |
@@ -55,8 +44,11 @@ jobs:
5544
runs-on: ubuntu-latest
5645
steps:
5746
- uses: actions/checkout@v4
47+
- uses: jdx/mise-action@v2
48+
with:
49+
cache_key_prefix: "pr_bp_"
5850
- id: go_version
59-
run: echo "go_version=$(cat .tool-versions | grep golang | awk '{print $2}')" >> $GITHUB_OUTPUT
51+
run: echo "go_version=$(mise current go)" >> $GITHUB_OUTPUT
6052
- uses: nais/platform-build-push-sign@main
6153
id: build-push-sign
6254
with:

.tool-versions

-2
This file was deleted.

README.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ So ensure that you configure and provide a proper environment for the reconciler
1616
You may use the example configuration file to skip the boring process of figuring it out:
1717

1818
```shell
19-
cp .env.example .env
19+
mise install # Install required dependencies
20+
cp .env.example .env # Copy the example configuration file
2021
```
2122

2223
To run the reconciler locally, you can use the following command:

mise.toml

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
[settings]
2+
pin = true
3+
4+
[tools]
5+
go = "1.24.0"
6+
helm = "3.17.1"

0 commit comments

Comments
 (0)