Skip to content

Commit efe82c9

Browse files
committed
fix(wooddpecker): secsets are deprecated
1 parent dcce4a5 commit efe82c9

4 files changed

Lines changed: 33 additions & 21 deletions

File tree

.woodpecker/build-linux.yml

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,17 @@ steps:
1414
- echo $CONTAINER_PASSWORD | podman login $DRYCC_REGISTRY --username $CONTAINER_USERNAME --password-stdin > /dev/null 2>&1
1515
- export VERSION=$([ -z $CI_COMMIT_TAG ] && echo latest || echo $CI_COMMIT_TAG)-$(sed 's#/#-#g' <<< $CI_SYSTEM_PLATFORM)
1616
- make podman-build podman-push
17-
secrets:
18-
- codename
19-
- dev_registry
20-
- drycc_registry
21-
- container_username
22-
- container_password
17+
environment:
18+
CODENAME:
19+
from_secret: codename
20+
DEV_REGISTRY:
21+
from_secret: dev_registry
22+
DRYCC_REGISTRY:
23+
from_secret: drycc_registry
24+
CONTAINER_USERNAME:
25+
from_secret: container_username
26+
CONTAINER_PASSWORD:
27+
from_secret: container_password
2328
when:
2429
event:
2530
- push

.woodpecker/chart.yaml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,15 @@ steps:
1414
- helm package -u charts/$${CI_REPO_NAME} --version $CHART_VERSION --app-version $APP_VERSION
1515
- echo $CONTAINER_PASSWORD | helm registry login $DRYCC_REGISTRY -u $CONTAINER_USERNAME --password-stdin
1616
- helm push $${CI_REPO_NAME}-$CHART_VERSION.tgz oci://$DRYCC_REGISTRY/$([ -z $CI_COMMIT_TAG ] && echo charts-testing || echo charts)
17-
secrets:
18-
- dev_registry
19-
- drycc_registry
20-
- container_username
21-
- container_password
17+
environment:
18+
DEV_REGISTRY:
19+
from_secret: dev_registry
20+
DRYCC_REGISTRY:
21+
from_secret: drycc_registry
22+
CONTAINER_USERNAME:
23+
from_secret: container_username
24+
CONTAINER_PASSWORD:
25+
from_secret: container_password
2226
when:
2327
event:
2428
- push

.woodpecker/manifest.yml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@ steps:
88
commands:
99
- sed -i "s/{{project}}/$${CI_REPO_NAME}/g" .woodpecker/manifest.tmpl
1010
- sed -i "s/registry.drycc.cc/$${DRYCC_REGISTRY}/g" .woodpecker/manifest.tmpl
11-
secrets:
12-
- drycc_registry
11+
environment:
12+
DRYCC_REGISTRY:
13+
from_secret: drycc_registry
1314
when:
1415
event:
1516
- tag
@@ -26,9 +27,11 @@ steps:
2627
-v $(pwd):$(pwd)
2728
-w $(pwd)
2829
plugins/manifest
29-
secrets:
30-
- container_username
31-
- container_password
30+
environment:
31+
CONTAINER_USERNAME:
32+
from_secret: container_username
33+
CONTAINER_PASSWORD:
34+
from_secret: container_password
3235
when:
3336
event:
3437
- tag

.woodpecker/test-linux.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ steps:
1212
image: bash
1313
commands:
1414
- make test
15-
secrets:
16-
- codename
17-
- dev_registry
18-
- drycc_registry
19-
- container_pull_secrets
15+
environment:
16+
CODENAME:
17+
from_secret: codename
18+
DEV_REGISTRY:
19+
from_secret: dev_registry
2020
when:
2121
event:
2222
- push

0 commit comments

Comments
 (0)