Skip to content

Commit 2c74ffe

Browse files
committed
fix(wooddpecker): secsets are deprecated
1 parent 399a37f commit 2c74ffe

5 files changed

Lines changed: 68 additions & 38 deletions

File tree

.woodpecker/build-linux-buildpacks.yml

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,17 @@ steps:
1616
- sed -i "s/{{CODENAME}}/$${CODENAME}/g" builder.toml
1717
- export PACK_HOME=$CI_WORKSPACE
1818
- make publish-buildpack
19-
secrets:
20-
- codename
21-
- dev_registry
22-
- drycc_registry
23-
- container_username
24-
- container_password
19+
environment:
20+
CODENAME:
21+
from_secret: codename
22+
DEV_REGISTRY:
23+
from_secret: dev_registry
24+
DRYCC_REGISTRY:
25+
from_secret: drycc_registry
26+
CONTAINER_USERNAME:
27+
from_secret: container_username
28+
CONTAINER_PASSWORD:
29+
from_secret: container_password
2530
when:
2631
event:
2732
- push

.woodpecker/build-linux-pack.yml

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,17 @@ steps:
1313
commands:
1414
- echo $CONTAINER_PASSWORD | podman login $DRYCC_REGISTRY --username $CONTAINER_USERNAME --password-stdin > /dev/null 2>&1
1515
- make publish-pack
16-
secrets:
17-
- codename
18-
- dev_registry
19-
- drycc_registry
20-
- container_username
21-
- container_password
16+
environment:
17+
CODENAME:
18+
from_secret: codename
19+
DEV_REGISTRY:
20+
from_secret: dev_registry
21+
DRYCC_REGISTRY:
22+
from_secret: drycc_registry
23+
CONTAINER_USERNAME:
24+
from_secret: container_username
25+
CONTAINER_PASSWORD:
26+
from_secret: container_password
2227
when:
2328
event:
2429
- push

.woodpecker/manifest-buildpacks.yml

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,17 @@ steps:
88
commands:
99
- sed -i "s/registry.drycc.cc/$${DRYCC_REGISTRY}/g" .woodpecker/manifest-buildpacks.tmpl
1010
- sed -i "s/{{codename}}/$${CODENAME}/g" .woodpecker/manifest-buildpacks.tmpl
11-
secrets:
12-
- codename
13-
- dev_registry
14-
- drycc_registry
15-
- container_username
16-
- container_password
11+
environment:
12+
CODENAME:
13+
from_secret: codename
14+
DEV_REGISTRY:
15+
from_secret: dev_registry
16+
DRYCC_REGISTRY:
17+
from_secret: drycc_registry
18+
CONTAINER_USERNAME:
19+
from_secret: container_username
20+
CONTAINER_PASSWORD:
21+
from_secret: container_password
1722
when:
1823
event:
1924
- push
@@ -31,9 +36,11 @@ steps:
3136
-v $(pwd):$(pwd)
3237
-w $(pwd)
3338
plugins/manifest
34-
secrets:
35-
- container_username
36-
- container_password
39+
environment:
40+
CONTAINER_USERNAME:
41+
from_secret: container_username
42+
CONTAINER_PASSWORD:
43+
from_secret: container_password
3744
when:
3845
event:
3946
- push

.woodpecker/manifest-pack.yml

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,17 @@ steps:
1010
- sed -i "s/registry.drycc.cc/$${DRYCC_REGISTRY}/g" .woodpecker/manifest-build.tmpl
1111
- sed -i "s/{{codename}}/$${CODENAME}/g" .woodpecker/manifest-run.tmpl
1212
- sed -i "s/{{codename}}/$${CODENAME}/g" .woodpecker/manifest-build.tmpl
13-
secrets:
14-
- codename
15-
- dev_registry
16-
- drycc_registry
17-
- container_username
18-
- container_password
13+
environment:
14+
CODENAME:
15+
from_secret: codename
16+
DEV_REGISTRY:
17+
from_secret: dev_registry
18+
DRYCC_REGISTRY:
19+
from_secret: drycc_registry
20+
CONTAINER_USERNAME:
21+
from_secret: container_username
22+
CONTAINER_PASSWORD:
23+
from_secret: container_password
1924
when:
2025
event:
2126
- push
@@ -33,9 +38,11 @@ steps:
3338
-v $(pwd):$(pwd)
3439
-w $(pwd)
3540
docker.io/plugins/manifest
36-
secrets:
37-
- container_username
38-
- container_password
41+
environment:
42+
CONTAINER_USERNAME:
43+
from_secret: container_username
44+
CONTAINER_PASSWORD:
45+
from_secret: container_password
3946
when:
4047
event:
4148
- push
@@ -53,9 +60,11 @@ steps:
5360
-v $(pwd):$(pwd)
5461
-w $(pwd)
5562
docker.io/plugins/manifest
56-
secrets:
57-
- container_username
58-
- container_password
63+
environment:
64+
CONTAINER_USERNAME:
65+
from_secret: container_username
66+
CONTAINER_PASSWORD:
67+
from_secret: container_password
5968
when:
6069
event:
6170
- push

.woodpecker/test-linux.yml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,15 @@ steps:
1212
image: bash
1313
commands:
1414
- make test-style
15-
secrets:
16-
- codename
17-
- dev_registry
18-
- codecov_token
19-
- drycc_registry
15+
environment:
16+
DEV_REGISTRY:
17+
from_secret: dev_registry
18+
DRYCC_REGISTRY:
19+
from_secret: drycc_registry
20+
CONTAINER_USERNAME:
21+
from_secret: container_username
22+
CONTAINER_PASSWORD:
23+
from_secret: container_password
2024
when:
2125
event:
2226
- push

0 commit comments

Comments
 (0)