Skip to content

Commit a69079c

Browse files
authored
Merge pull request #17 from windsource/from-make-to-just
Replace make with just
2 parents e9b7bf4 + c9d5a49 commit a69079c

File tree

3 files changed

+16
-108
lines changed

3 files changed

+16
-108
lines changed

.woodpecker.yml

Lines changed: 12 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
variables:
2-
- &rust 'rust:1.79-bookworm'
2+
- &devcon 'ghcr.io/windsource/picus-devcontainer:1.0.0'
33
- &buildx_plugin 'woodpeckerci/plugin-docker-buildx:4.2.0'
44

55
labels:
@@ -36,51 +36,44 @@ steps:
3636

3737
# The license check has to before the vendor command as otherweise 'cargo install' will not work
3838
- name: check-licenses
39-
image: *rust
39+
image: *devcon
4040
commands:
41-
- make check-licenses
41+
- just check-licenses
4242
when:
4343
- event: pull_request
4444
- event: [push, tag, manual]
4545
branch: main
4646

4747
- name: vendor
48-
image: *rust
48+
image: *devcon
4949
commands:
50-
- make vendor
50+
- just vendor
5151
when:
5252
- event: tag
5353

5454
- name: build-x86
55-
image: *rust
55+
image: *devcon
5656
commands:
57-
- apt update
58-
- apt install -y musl-tools
59-
- rustup target add x86_64-unknown-linux-musl
60-
- make test
61-
- make build-amd64
57+
- just test
58+
- just build-amd64
6259
when:
6360
- event: pull_request
6461
- event: [push, tag, manual]
6562
branch: main
6663

6764
- name: build-arm64
68-
image: *rust
65+
image: *devcon
6966
commands:
70-
- dpkg --add-architecture arm64
71-
- apt update
72-
- apt install -y --no-install-recommends gcc-aarch64-linux-gnu musl-tools libc6-dev:arm64
73-
- rustup target add aarch64-unknown-linux-musl
74-
- make build-arm64
67+
- just build-arm64
7568
when:
7669
- event: pull_request
7770
- event: [push, tag, manual]
7871
branch: main
7972

8073
- name: checksum
81-
image: *rust
74+
image: *devcon
8275
commands:
83-
- make checksum
76+
- just checksum
8477
when:
8578
- event: tag
8679

Makefile

Lines changed: 0 additions & 85 deletions
This file was deleted.

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,25 +120,25 @@ contains all required tools.
120120
Debug build:
121121

122122
```shell
123-
make build
123+
just build
124124
```
125125

126126
Release build for amd64 target:
127127

128128
```shell
129-
make build-amd64
129+
just build-amd64
130130
```
131131

132132
Release build for arm64 target:
133133

134134
```shell
135-
make build-arm64
135+
just build-arm64
136136
```
137137

138138
### Test
139139

140140
```shell
141-
make test
141+
just test
142142
```
143143

144144
In order to run the tests using Hetzner cloud as well, provide the required

0 commit comments

Comments
 (0)