From 1271ce2a3a9bfb741426661c72646b591d13f9b5 Mon Sep 17 00:00:00 2001 From: James Strachan Date: Mon, 4 Feb 2019 11:31:19 +0000 Subject: [PATCH] fix: lets give steps a simple canonical name for easier reporting and to make overriding steps easier --- packs/D/pipeline.yaml | 4 ++++ packs/go/pipeline.yaml | 7 +++++++ packs/gradle/pipeline.yaml | 4 ++++ packs/javascript/pipeline.yaml | 5 +++++ packs/maven/pipeline.yaml | 6 ++++++ packs/python/pipeline.yaml | 4 ++++ packs/rust/pipeline.yaml | 8 ++++++++ packs/scala/pipeline.yaml | 4 ++++ 8 files changed, 42 insertions(+) diff --git a/packs/D/pipeline.yaml b/packs/D/pipeline.yaml index 7562040..94c7337 100644 --- a/packs/D/pipeline.yaml +++ b/packs/D/pipeline.yaml @@ -8,13 +8,17 @@ pipelines: build: steps: - sh: dub build --build=release + name: dub-build release: setVersion: steps: - sh: echo \$(jx-release-version) > VERSION + name: next-version comment: so we can retrieve the version in later steps - sh: jx step tag --version \$(cat VERSION) + name: tag-version build: steps: - sh: dub build --build=release + name: dub-build diff --git a/packs/go/pipeline.yaml b/packs/go/pipeline.yaml index c790f50..adff609 100644 --- a/packs/go/pipeline.yaml +++ b/packs/go/pipeline.yaml @@ -10,6 +10,7 @@ pipelines: build: steps: - sh: make linux + name: make-linux release: setup: steps: @@ -18,17 +19,23 @@ pipelines: - groovy: checkout scm when: "!prow" - sh: git checkout master + name: git-checkout-master comment: ensure we're not on a detached head when: "!prow" - sh: git config --global credential.helper store when: "!prow" + name: git-config - sh: jx step git credentials when: "!prow" + name: git-credentials setVersion: steps: - sh: echo \$(jx-release-version) > VERSION + name: next-version comment: so we can retrieve the version in later steps - sh: jx step tag --version \$(cat VERSION) + name: tag-version build: steps: - sh: make build + name: make-build diff --git a/packs/gradle/pipeline.yaml b/packs/gradle/pipeline.yaml index 6dd11d6..2b32aab 100644 --- a/packs/gradle/pipeline.yaml +++ b/packs/gradle/pipeline.yaml @@ -8,14 +8,18 @@ pipelines: build: steps: - sh: gradle clean build + name: gradle-build release: setVersion: steps: - sh: echo \$(jx-release-version) > VERSION + name: next-version comment: so we can retrieve the version in later steps # TODO # - sh: mvn versions:set -DnewVersion=\$(cat VERSION) - sh: jx step tag --version \$(cat VERSION) + name: tag-version build: steps: - sh: gradle clean build + name: gradle-build diff --git a/packs/javascript/pipeline.yaml b/packs/javascript/pipeline.yaml index 6aa2e9c..909ae03 100644 --- a/packs/javascript/pipeline.yaml +++ b/packs/javascript/pipeline.yaml @@ -8,15 +8,20 @@ pipelines: build: steps: - sh: npm install + name: npm-install - sh: CI=true DISPLAY=:99 npm test release: setVersion: steps: - sh: echo \$(jx-release-version) > VERSION + name: next-version comment: so we can retrieve the version in later steps # TODO modify package.json? - sh: jx step tag --version \$(cat VERSION) + name: tag-version build: steps: - sh: npm install + name: npm-install - sh: CI=true DISPLAY=:99 npm test + name: npm-test diff --git a/packs/maven/pipeline.yaml b/packs/maven/pipeline.yaml index acc5be2..2435b41 100644 --- a/packs/maven/pipeline.yaml +++ b/packs/maven/pipeline.yaml @@ -8,14 +8,20 @@ pipelines: build: steps: - sh: mvn versions:set -DnewVersion=$PREVIEW_VERSION + name: set-version - sh: mvn install + name: mvn-install release: setVersion: steps: - sh: echo \$(jx-release-version) > VERSION + name: next-version comment: so we can retrieve the version in later steps - sh: mvn versions:set -DnewVersion=\$(cat VERSION) + name: set-version - sh: jx step tag --version \$(cat VERSION) + name: tag-version build: steps: - sh: mvn clean deploy + name: mvn-deploy diff --git a/packs/python/pipeline.yaml b/packs/python/pipeline.yaml index a0a5ec0..bc3c550 100644 --- a/packs/python/pipeline.yaml +++ b/packs/python/pipeline.yaml @@ -8,13 +8,17 @@ pipelines: build: steps: - sh: python -m unittest + name: python-unittest release: setVersion: steps: - sh: echo \$(jx-release-version) > VERSION + name: next-version comment: so we can retrieve the version in later steps # TODO set the version in source? - sh: jx step tag --version \$(cat VERSION) + name: tag-version build: steps: - sh: python -m unittest + name: python-unittest diff --git a/packs/rust/pipeline.yaml b/packs/rust/pipeline.yaml index 864d68d..b95402c 100644 --- a/packs/rust/pipeline.yaml +++ b/packs/rust/pipeline.yaml @@ -8,17 +8,25 @@ pipelines: build: steps: - sh: rustup override set nightly + name: rustup - sh: cargo install + name: cargo-install - sh: cp ~/.cargo/bin/REPLACE_ME_APP_NAME . + name: copy-bin release: setVersion: steps: - sh: echo \$(jx-release-version) > VERSION + name: next-version comment: so we can retrieve the version in later steps # TODO set the version in source? - sh: jx step tag --version \$(cat VERSION) + name: tag-version build: steps: - sh: rustup override set nightly + name: rustup - sh: cargo install + name: cargo-install - sh: cp ~/.cargo/bin/REPLACE_ME_APP_NAME . + name: copy-bin diff --git a/packs/scala/pipeline.yaml b/packs/scala/pipeline.yaml index 52e121f..d434905 100644 --- a/packs/scala/pipeline.yaml +++ b/packs/scala/pipeline.yaml @@ -8,13 +8,17 @@ pipelines: build: steps: - sh: sbt clean compile assembly + name: sbt-assembly release: setVersion: steps: - sh: echo \$(jx-release-version) > VERSION + name: next-version comment: so we can retrieve the version in later steps # TODO set version with sbt? - sh: jx step tag --version \$(cat VERSION) + name: tag-version build: steps: - sh: sbt clean compile assembly + name: sbt-assembly