Skip to content

Commit

Permalink
Fix commit on workflows
Browse files Browse the repository at this point in the history
* Fix workflows
* Fix old versions
* Fix not rebuild after bot commit
  • Loading branch information
PierreLeresteux authored Mar 20, 2020
1 parent 785dae7 commit 52446ea
Show file tree
Hide file tree
Showing 9 changed files with 40 additions and 107 deletions.
67 changes: 0 additions & 67 deletions .github/workflows/buildAllJobs.yml

This file was deleted.

4 changes: 2 additions & 2 deletions .github/workflows/buildOnlyModified.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ on:

jobs:
build:

runs-on: ubuntu-latest
if: "!contains(github.event.head_commit.message, '[BOT]')"

steps:
- uses: actions/checkout@v1
Expand All @@ -30,7 +30,7 @@ jobs:
run: |
git config --local user.email "[email protected]"
git config --local user.name "GitHub Action Bot"
git add **/dockerInfo.yml **/metadata.yml version.properties
git add **/dockerInfo.yaml **/metadata.yaml **/dockerInfo.yml **/metadata.yml version.properties
git commit -m "[BOT] Set version for this branch"
- name: Push changes
uses: ad-m/github-push-action@master
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/promote.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ jobs:
run: |
git config --local user.email "[email protected]"
git config --local user.name "GitHub Action Bot"
git add **/metadata.yml **/dockerInfo.yml version.properties
git add **/metadata.yml **/dockerInfo.yml **/metadata.yaml **/dockerInfo.yaml version.properties
git commit -m "[BOT] Set new version"
- name: Push changes
uses: ad-m/github-push-action@master
Expand Down
26 changes: 13 additions & 13 deletions technologies/job/bash/metadata.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ label: Bash
available: true
icon: bash
contexts:
- id: debian9-stretch-gcp
label: debian9-stretch-gcp
- id: debian9-stretch
label: debian9-stretch
available: true
recommended: false
recommended: true
dockerInfo:
image: saagie/bash
version: debian9-stretch-gcp-1.14.0
version: debian9-stretch-1.14.0
trustLevel: "stable"
job:
features:
Expand All @@ -27,13 +27,13 @@ contexts:
- field: SCHEDULER
label: Scheduled
mandatory: true
- id: debian9-stretch
label: debian9-stretch
- id: debian9-stretch-azure
label: debian9-stretch-azure
available: true
recommended: true
recommended: false
dockerInfo:
image: saagie/bash
version: debian9-stretch-1.14.0
version: debian9-stretch-azure-1.14.0
trustLevel: "stable"
job:
features:
Expand All @@ -49,6 +49,7 @@ contexts:
- field: SCHEDULER
label: Scheduled
mandatory: true

- id: debian9-stretch-aws
label: debian9-stretch-aws
available: true
Expand All @@ -71,13 +72,13 @@ contexts:
- field: SCHEDULER
label: Scheduled
mandatory: true
- id: debian9-stretch-azure
label: debian9-stretch-azure
- id: debian9-stretch-gcp
label: debian9-stretch-gcp
available: true
recommended: false
dockerInfo:
image: saagie/bash
version: debian9-stretch-azure-1.14.0
version: debian9-stretch-gcp-1.14.0
trustLevel: "stable"
job:
features:
Expand All @@ -92,5 +93,4 @@ contexts:
comment: All files are accepted.
- field: SCHEDULER
label: Scheduled
mandatory: true

mandatory: true
2 changes: 1 addition & 1 deletion technologies/job/java/14/dockerInfo.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
dockerInfo:
image: saagie/java-scala
version: 14-1.15.0_add_java14_and_sqoop
version: 14-1.17.0_fix_commit
38 changes: 19 additions & 19 deletions technologies/job/java/metadata.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ label: Java/Scala
available: true
icon: java-scala
contexts:
- id: 8
label: 8
- id: 7
label: 7
available: true
recommended: false
dockerInfo:
image: saagie/java-scala
version: 8-1.14.0
version: 7-1.14.0
trustLevel: "stable"
job:
features:
Expand All @@ -27,13 +27,13 @@ contexts:
- field: SCHEDULER
label: "Scheduled"
mandatory: true
- id: 14
label: 14
- id: 13
label: 13
available: true
recommended: false
dockerInfo:
image: saagie/java-scala
version: 14-1.15.0_add_java14_and_sqoop
version: 13-1.16.0
trustLevel: "experimental"
job:
features:
Expand All @@ -49,13 +49,13 @@ contexts:
- field: SCHEDULER
label: "Scheduled"
mandatory: true
- id: 11
label: 11
- id: 8
label: 8
available: true
recommended: true
recommended: false
dockerInfo:
image: saagie/java-scala
version: 11-1.14.0
version: 8-1.14.0
trustLevel: "stable"
job:
features:
Expand All @@ -71,14 +71,14 @@ contexts:
- field: SCHEDULER
label: "Scheduled"
mandatory: true
- id: 13
label: 13
- id: 11
label: 11
available: true
recommended: false
recommended: true
dockerInfo:
image: saagie/java-scala
version: 13-1.14.0
trustLevel: "experimental"
version: 11-1.14.0
trustLevel: "stable"
job:
features:
- field: COMMAND_LINE
Expand All @@ -93,14 +93,14 @@ contexts:
- field: SCHEDULER
label: "Scheduled"
mandatory: true
- id: 7
label: 7
- id: 14
label: 14
available: true
recommended: false
dockerInfo:
image: saagie/java-scala
version: 7-1.14.0
trustLevel: "stable"
version: 14-1.17.0_fix_commit
trustLevel: "experimental"
job:
features:
- field: COMMAND_LINE
Expand Down
2 changes: 1 addition & 1 deletion technologies/job/sqoop/1.4.6/dockerInfo.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
dockerInfo:
image: saagie/sqoop
version: 1.4.6-1.15.0_add_java14_and_sqoop
version: 1.4.6-1.17.0_fix_commit
2 changes: 1 addition & 1 deletion technologies/job/sqoop/metadata.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ contexts:
recommended: true
dockerInfo:
image: saagie/sqoop
version: 1.4.6-1.15.0_add_java14_and_sqoop
version: 1.4.6-1.17.0_fix_commit
trustLevel: "stable"
job:
features:
Expand Down
4 changes: 2 additions & 2 deletions version.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
version.buildmeta=
version.buildmeta=fix_commit
version.major=1
version.minor=17
version.patch=0
version.prerelease=
version.semver=1.17.0
version.semver=1.17.0+fix_commit

0 comments on commit 52446ea

Please sign in to comment.