Skip to content
This repository was archived by the owner on May 14, 2025. It is now read-only.

Commit 898e299

Browse files
author
Corneil du Plessis
authored
Make env vars explicit. (#5218)
Fix working directory.
1 parent cd39a63 commit 898e299

File tree

3 files changed

+60
-59
lines changed

3 files changed

+60
-59
lines changed

‎.github/workflows/carvel-worker.yml‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -38,47 +38,47 @@ jobs:
3838
id: build-package-bundle
3939
uses: ./.github/actions/build-package-bundle
4040
with:
41-
dataflow-version: ${{ env.BUILD_ZOO_HANDLER_spring_cloud_dataflow_version }}
42-
skipper-version: ${{ env.BUILD_ZOO_HANDLER_spring_cloud_skipper_version }}
43-
server-version: ${{ env.BUILD_ZOO_HANDLER_spring_cloud_dataflow_version }}
44-
server-repository: springcloud/spring-cloud-dataflow-server
45-
ctr-version: ${{ env.BUILD_ZOO_HANDLER_spring_cloud_dataflow_version }}
46-
package-name: scdf
47-
package-bundle-template: src/carvel/templates/bundle/package
48-
imgpkg-lock-template: src/carvel/templates/imgpkg
49-
config: src/carvel/config
41+
dataflow-version: '${{ env.BUILD_ZOO_HANDLER_spring_cloud_dataflow_version }}'
42+
skipper-version: '${{ env.BUILD_ZOO_HANDLER_spring_cloud_skipper_version }}'
43+
server-version: '${{ env.BUILD_ZOO_HANDLER_spring_cloud_dataflow_version }}'
44+
server-repository: 'springcloud/spring-cloud-dataflow-server'
45+
ctr-version: '${{ env.BUILD_ZOO_HANDLER_spring_cloud_dataflow_version }}'
46+
package-name: 'scdf'
47+
package-bundle-template: 'src/carvel/templates/bundle/package'
48+
imgpkg-lock-template: 'src/carvel/templates/imgpkg'
49+
config: 'src/carvel/config'
5050

5151
# Publishes scdf package bundle as it needs to be in place
5252
# before repository bundle can be created.
5353
- name: Publish Package Bundle
5454
id: publish-package-bundle
5555
uses: ./.github/actions/publish-bundle
5656
with:
57-
path: ${{ steps.build-package-bundle.outputs.bundle-path }}
58-
repository: springcloud/scdf-package
59-
version: ${{ env.BUILD_ZOO_HANDLER_spring_cloud_dataflow_version_nopostfix }}
60-
prerelease: ${{ env.BUILD_ZOO_HANDLER_spring_cloud_dataflow_prerelease }}
57+
path: '${{ steps.build-package-bundle.outputs.bundle-path }}'
58+
repository: 'springcloud/scdf-package'
59+
version: '${{ env.BUILD_ZOO_HANDLER_spring_cloud_dataflow_version_nopostfix }}'
60+
prerelease: '${{ env.BUILD_ZOO_HANDLER_spring_cloud_dataflow_prerelease }}'
6161

6262
# Builds a repository bundle
6363
- name: Build Repository Bundle
6464
id: build-repository-bundle
6565
uses: ./.github/actions/build-repository-bundle
6666
with:
67-
version: ${{ env.BUILD_ZOO_HANDLER_spring_cloud_dataflow_version }}
68-
repo-bundle-template: src/carvel/templates/bundle/repo
69-
package-bundle-repository: springcloud/scdf-package
70-
package-name: scdf
67+
version: '${{ env.BUILD_ZOO_HANDLER_spring_cloud_dataflow_version }}'
68+
repo-bundle-template: 'src/carvel/templates/bundle/repo'
69+
package-bundle-repository: 'springcloud/scdf-package'
70+
package-name: 'scdf'
7171
token: ${{ secrets.GITHUB_TOKEN }}
7272

7373
# Publishes scdf repo bundle
7474
- name: Publish Repository Bundle
7575
id: publish-repository-bundle
7676
uses: ./.github/actions/publish-bundle
7777
with:
78-
path: ${{ steps.build-repository-bundle.outputs.bundle-path }}
79-
repository: springcloud/scdf-repo
80-
version: ${{ env.BUILD_ZOO_HANDLER_spring_cloud_dataflow_version_nopostfix }}
81-
prerelease: ${{ env.BUILD_ZOO_HANDLER_spring_cloud_dataflow_prerelease }}
78+
path: '${{ steps.build-repository-bundle.outputs.bundle-path }}'
79+
repository: 'springcloud/scdf-repo'
80+
version: '${{ env.BUILD_ZOO_HANDLER_spring_cloud_dataflow_version_nopostfix }}'
81+
prerelease: '${{ env.BUILD_ZOO_HANDLER_spring_cloud_dataflow_prerelease }}'
8282

8383
# zoo success
8484
- name: Notify Build Success Zoo Handler Controller

‎.github/workflows/ci-carvel.yml‎

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@ jobs:
1414
publish:
1515
name: Publish
1616
runs-on: ubuntu-latest
17-
defaults:
18-
run:
19-
shell: bash
20-
working-directory: src/carvel
2117
steps:
2218
- uses: actions/checkout@v2
2319
- uses: actions/setup-node@v2
@@ -27,74 +23,78 @@ jobs:
2723
with:
2824
token: ${{ secrets.GITHUB_TOKEN }}
2925
- name: Setup npm
30-
run: |
31-
npm install
26+
shell: bash
27+
working-directory: src/carvel
28+
run: npm install
3229
- name: npm ci
33-
run: |
34-
npm ci
30+
shell: bash
31+
working-directory: src/carvel
32+
run: npm ci
3533
- name: Lint
36-
run: |
37-
npm run format-check
34+
shell: bash
35+
working-directory: src/carvel
36+
run: npm run format-check
3837
- name: Test
39-
run: |
40-
npm test
38+
shell: bash
39+
working-directory: src/carvel
40+
run: npm test
4141
- uses: jvalkeal/setup-maven@v1
4242
with:
43-
maven-version: 3.6.2
43+
maven-version: 3.8.4
44+
token: ${{ secrets.GITHUB_TOKEN }}
4445
- name: Login dockerhub
4546
uses: docker/login-action@v1
4647
with:
4748
username: ${{ secrets.DOCKERHUB_USERNAME }}
4849
password: ${{ secrets.DOCKERHUB_TOKEN }}
4950
- name: Configure Env
5051
run: |
51-
echo spring_cloud_dataflow_version=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout) >> $GITHUB_ENV
52-
echo spring_cloud_skipper_version=$(mvn help:evaluate -Dexpression=spring-cloud-skipper.version -q -DforceStdout) >> $GITHUB_ENV
53-
echo spring_cloud_dataflow_version_nopostfix=$(echo '${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}' | mvn build-helper:parse-version help:evaluate -q -DforceStdout) >> $GITHUB_ENV
52+
echo SPRING_CLOUD_DATAFLOW_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout) >> $GITHUB_ENV
53+
echo SPRING_CLOUD_SKIPPER_VERSION=$(mvn help:evaluate -Dexpression=spring-cloud-skipper.version -q -DforceStdout) >> $GITHUB_ENV
54+
echo SPRING_CLOUD_DATAFLOW_VERSION_NOPOSTFIX=$(echo '${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}' | mvn build-helper:parse-version help:evaluate -q -DforceStdout) >> $GITHUB_ENV
5455
5556
# Builds a package bundle
5657
- name: Build Package Bundle
5758
id: build-package-bundle
5859
uses: ./.github/actions/build-package-bundle
5960
with:
60-
dataflow-version: ${{ env.spring_cloud_dataflow_version }}
61-
skipper-version: ${{ env.spring_cloud_skipper_version }}
62-
server-version: ${{ env.spring_cloud_dataflow_version }}
63-
server-repository: springcloud/spring-cloud-dataflow-server
64-
ctr-version: ${{ env.spring_cloud_dataflow_version }}
65-
package-name: scdf
66-
package-bundle-template: src/carvel/templates/bundle/package
67-
imgpkg-lock-template: src/carvel/templates/imgpkg
68-
config: src/carvel/config
61+
dataflow-version: '${{ env.SPRING_CLOUD_DATAFLOW_VERSION }}'
62+
skipper-version: '${{ env.SPRING_CLOUD_SKIPPER_VERSION }}'
63+
server-version: '${{ env.SPRING_CLOUD_DATAFLOW_VERSION }}'
64+
server-repository: 'springcloud/spring-cloud-dataflow-server'
65+
ctr-version: '${{ env.SPRING_CLOUD_DATAFLOW_VERSION }}'
66+
package-name: 'scdf'
67+
package-bundle-template: 'src/carvel/templates/bundle/package'
68+
imgpkg-lock-template: 'src/carvel/templates/imgpkg'
69+
config: 'src/carvel/config'
6970

7071
# Publishes scdf package bundle as it needs to be in place
7172
# before repository bundle can be created.
7273
- name: Publish Package Bundle
7374
id: publish-package-bundle
7475
uses: ./.github/actions/publish-bundle
7576
with:
76-
path: ${{ steps.build-package-bundle.outputs.bundle-path }}
77-
repository: springcloud/scdf-package
78-
version: ${{ env.spring_cloud_dataflow_version_nopostfix }}
79-
prerelease: SNAPSHOT
77+
path: '${{ steps.build-package-bundle.outputs.bundle-path }}'
78+
repository: 'springcloud/scdf-package'
79+
version: '${{ env.SPRING_CLOUD_DATAFLOW_VERSION_NOPOSTFIX }}'
80+
prerelease: 'SNAPSHOT'
8081

8182
# Builds a repository bundle
8283
- name: Build Repository Bundle
8384
id: build-repository-bundle
8485
uses: ./.github/actions/build-repository-bundle
8586
with:
86-
version: ${{ env.spring_cloud_dataflow_version }}
87-
repo-bundle-template: src/carvel/templates/bundle/repo
88-
package-bundle-repository: springcloud/scdf-package
89-
package-name: scdf
90-
token: ${{ secrets.GITHUB_TOKEN }}
87+
version: '${{ env.SPRING_CLOUD_DATAFLOW_VERSION }}'
88+
repo-bundle-template: 'src/carvel/templates/bundle/repo'
89+
package-bundle-repository: 'springcloud/scdf-package'
90+
package-name: 'scdf'
9191

9292
# Publishes scdf repo bundle
9393
- name: Publish Repository Bundle
9494
id: publish-repository-bundle
9595
uses: ./.github/actions/publish-bundle
9696
with:
97-
path: ${{ steps.build-repository-bundle.outputs.bundle-path }}
98-
repository: springcloud/scdf-repo
99-
version: ${{ env.spring_cloud_dataflow_version_nopostfix }}
100-
prerelease: SNAPSHOT
97+
path: '${{ steps.build-repository-bundle.outputs.bundle-path }}'
98+
repository: 'springcloud/scdf-repo'
99+
version: '${{ env.SPRING_CLOUD_DATAFLOW_VERSION_NOPOSTFIX }}'
100+
prerelease: 'SNAPSHOT'

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,3 +54,4 @@ cleanup.sh
5454
node_modules
5555
!/.idea/checkstyle-idea.xml
5656
yagni/
57+
workspace/

0 commit comments

Comments
 (0)