Skip to content

Commit 1d7d73f

Browse files
kskewes-sfkskewes-sf
authored
chore(ci): Add GHA for last publish of Monitoring Daemon (#272)
* chore(ci): Add GHA for last publish of Monitoring Daemon We need to publish a debian package to Google Artifact Registry for use by Halyard as part of the BOM. ``` $ ORG_GRADLE_PROJECT_version=1.2.3 ./gradlew buildDeb > Task :spinnaker-monitoring-daemon:buildDeb > Task :spinnaker-monitoring-third-party:buildDeb <snip> $ find . -name *.deb ./spinnaker-monitoring-third-party/build/distributions/spinnaker-monitoring-third-party_1.2.3_all.deb ./spinnaker-monitoring-daemon/build/distributions/spinnaker-monitoring-daemon_1.2.3_all.deb ``` * chore(ci): Skip running broken tests
1 parent a4b16d1 commit 1d7d73f

File tree

7 files changed

+266
-3
lines changed

7 files changed

+266
-3
lines changed

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
We prefer small, well tested pull requests.
2+
3+
Please refer to [Contributing to Spinnaker](https://spinnaker.io/community/contributing/).
4+
5+
When filling out a pull request, please consider the following:
6+
7+
* Follow the commit message conventions [found here](https://spinnaker.io/community/contributing/submitting/).
8+
* Provide a descriptive summary for your changes.
9+
* If it fixes a bug or resolves a feature request, be sure to link to that issue.
10+
* Add inline code comments to changes that might not be obvious.
11+
* Squash your commits as you keep adding changes.
12+
* Add a comment to @spinnaker/reviewers for review if your issue has been outstanding for more than 3 days.
13+
14+
Note that we are unlikely to accept pull requests that add features without prior discussion. The best way to propose a feature is to open an issue first and discuss your ideas there before implementing them.

‎.github/workflows/build.yml‎

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
name: Branch Build
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
- release-*
8+
9+
env:
10+
GRADLE_OPTS: -Dorg.gradle.daemon=false -Xmx2g -Xms2g
11+
CONTAINER_REGISTRY: us-docker.pkg.dev/spinnaker-community/docker
12+
13+
jobs:
14+
branch-build:
15+
# Only run this on repositories in the 'spinnaker' org, not on forks.
16+
if: startsWith(github.repository, 'spinnaker/')
17+
runs-on: ubuntu-latest
18+
steps:
19+
- uses: actions/checkout@v2
20+
with:
21+
fetch-depth: 0
22+
- uses: actions/setup-java@v2
23+
with:
24+
java-version: 11
25+
distribution: 'zulu'
26+
cache: 'gradle'
27+
- name: Prepare build variables
28+
id: build_variables
29+
run: |
30+
echo ::set-output name=REPO::monitoring-daemon
31+
echo ::set-output name=VERSION::"$(git describe --tags --abbrev=0 --match="v[0-9]*" | cut -c2-)-dev-${GITHUB_REF_NAME}-$(git rev-parse --short HEAD)-$(date --utc +'%Y%m%d%H%M')"
32+
- name: Build
33+
env:
34+
ORG_GRADLE_PROJECT_version: ${{ steps.build_variables.outputs.VERSION }}
35+
run: ./gradlew build --stacktrace -x test
36+
- name: Login to GAR
37+
# Only run this on repositories in the 'spinnaker' org, not on forks.
38+
if: startsWith(github.repository, 'spinnaker/')
39+
uses: docker/login-action@v1
40+
# use service account flow defined at: https://github.com/docker/login-action#service-account-based-authentication-1
41+
with:
42+
registry: us-docker.pkg.dev
43+
username: _json_key
44+
password: ${{ secrets.GAR_JSON_KEY }}
45+
- name: Build and publish slim container image
46+
# Only run this on repositories in the 'spinnaker' org, not on forks.
47+
if: startsWith(github.repository, 'spinnaker/')
48+
uses: docker/build-push-action@v2
49+
with:
50+
context: .
51+
file: Dockerfile.slim
52+
push: true
53+
tags: |
54+
"${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ github.ref_name }}-latest-unvalidated"
55+
"${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.build_variables.outputs.VERSION }}-unvalidated"
56+
"${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ github.ref_name }}-latest-unvalidated-slim"
57+
"${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.build_variables.outputs.VERSION }}-unvalidated-slim"
58+
- name: Build and publish ubuntu container image
59+
# Only run this on repositories in the 'spinnaker' org, not on forks.
60+
if: startsWith(github.repository, 'spinnaker/')
61+
uses: docker/build-push-action@v2
62+
with:
63+
context: .
64+
file: Dockerfile.ubuntu
65+
push: true
66+
tags: |
67+
"${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ github.ref_name }}-latest-unvalidated-ubuntu"
68+
"${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.build_variables.outputs.VERSION }}-unvalidated-ubuntu"

‎.github/workflows/pr.yml‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
name: PR Build
2+
3+
on: [ pull_request ]
4+
5+
env:
6+
GRADLE_OPTS: -Dorg.gradle.daemon=false -Xmx2g -Xms2g
7+
CONTAINER_REGISTRY: us-docker.pkg.dev/spinnaker-community/docker
8+
9+
jobs:
10+
build:
11+
runs-on: ubuntu-latest
12+
steps:
13+
- uses: actions/checkout@v2
14+
with:
15+
fetch-depth: 0
16+
- uses: actions/setup-java@v2
17+
with:
18+
java-version: 11
19+
distribution: 'zulu'
20+
cache: 'gradle'
21+
- name: Prepare build variables
22+
id: build_variables
23+
run: |
24+
echo ::set-output name=REPO::monitoring-daemon
25+
echo ::set-output name=VERSION::"$(git describe --tags --abbrev=0 --match="v[0-9]*" | cut -c2-)-dev-pr-$(git rev-parse --short HEAD)-$(date --utc +'%Y%m%d%H%M')"
26+
- name: Build
27+
env:
28+
ORG_GRADLE_PROJECT_version: ${{ steps.build_variables.outputs.VERSION }}
29+
run: ./gradlew build -x test
30+
- name: Build slim container image
31+
uses: docker/build-push-action@v2
32+
with:
33+
context: .
34+
file: Dockerfile.slim
35+
tags: |
36+
"${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:latest"
37+
"${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.build_variables.outputs.VERSION }}"
38+
"${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:latest-slim"
39+
"${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.build_variables.outputs.VERSION }}-slim"
40+
- name: Build ubuntu container image
41+
uses: docker/build-push-action@v2
42+
with:
43+
context: .
44+
file: Dockerfile.ubuntu
45+
tags: |
46+
"${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:latest-ubuntu"
47+
"${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.build_variables.outputs.VERSION }}-ubuntu"

‎.github/workflows/release.yml‎

Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,100 @@
1+
name: Release
2+
3+
on:
4+
push:
5+
tags:
6+
- "v[0-9]+.[0-9]+.[0-9]+"
7+
- "v[0-9]+.[0-9]+.[0-9]+-rc.[0-9]+"
8+
9+
env:
10+
GRADLE_OPTS: -Dorg.gradle.daemon=false -Xmx2g -Xms2g
11+
CONTAINER_REGISTRY: us-docker.pkg.dev/spinnaker-community/docker
12+
13+
jobs:
14+
release:
15+
runs-on: ubuntu-latest
16+
steps:
17+
- uses: actions/checkout@v2
18+
with:
19+
fetch-depth: 0
20+
- uses: actions/setup-java@v2
21+
with:
22+
java-version: 11
23+
distribution: 'zulu'
24+
cache: 'gradle'
25+
- name: Assemble release info
26+
id: release_info
27+
env:
28+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
29+
run: |
30+
. .github/workflows/release_info.sh ${{ github.event.repository.full_name }}
31+
echo ::set-output name=CHANGELOG::$(echo -e "${CHANGELOG}")
32+
echo ::set-output name=SKIP_RELEASE::${SKIP_RELEASE}
33+
echo ::set-output name=IS_CANDIDATE::${IS_CANDIDATE}
34+
echo ::set-output name=RELEASE_VERSION::${RELEASE_VERSION}
35+
- name: Prepare build variables
36+
id: build_variables
37+
run: |
38+
echo ::set-output name=REPO::monitoring-daemon
39+
echo ::set-output name=VERSION::"$(git rev-parse --short HEAD)-$(date --utc +'%Y%m%d%H%M')"
40+
- name: Release build
41+
env:
42+
ORG_GRADLE_PROJECT_version: ${{ steps.release_info.outputs.RELEASE_VERSION }}
43+
ORG_GRADLE_PROJECT_nexusPublishEnabled: true
44+
ORG_GRADLE_PROJECT_nexusUsername: ${{ secrets.NEXUS_USERNAME }}
45+
ORG_GRADLE_PROJECT_nexusPassword: ${{ secrets.NEXUS_PASSWORD }}
46+
ORG_GRADLE_PROJECT_nexusPgpSigningKey: ${{ secrets.NEXUS_PGP_SIGNING_KEY }}
47+
ORG_GRADLE_PROJECT_nexusPgpSigningPassword: ${{ secrets.NEXUS_PGP_SIGNING_PASSWORD }}
48+
run: |
49+
./gradlew --info build -x test
50+
- name: Publish apt packages to Google Artifact Registry
51+
env:
52+
ORG_GRADLE_PROJECT_version: ${{ steps.release_info.outputs.RELEASE_VERSION }}
53+
ORG_GRADLE_PROJECT_artifactRegistryPublishEnabled: true
54+
GAR_JSON_KEY: ${{ secrets.GAR_JSON_KEY }}
55+
run: |
56+
./gradlew --info publishDebToArtifactRegistry
57+
- name: Login to GAR
58+
# Only run this on repositories in the 'spinnaker' org, not on forks.
59+
if: startsWith(github.repository, 'spinnaker/')
60+
uses: docker/login-action@v1
61+
# use service account flow defined at: https://github.com/docker/login-action#service-account-based-authentication-1
62+
with:
63+
registry: us-docker.pkg.dev
64+
username: _json_key
65+
password: ${{ secrets.GAR_JSON_KEY }}
66+
- name: Build and publish slim container image
67+
# Only run this on repositories in the 'spinnaker' org, not on forks.
68+
if: startsWith(github.repository, 'spinnaker/')
69+
uses: docker/build-push-action@v2
70+
with:
71+
context: .
72+
file: Dockerfile.slim
73+
push: true
74+
tags: |
75+
"${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.release_info.outputs.RELEASE_VERSION }}-unvalidated"
76+
"${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.release_info.outputs.RELEASE_VERSION }}-unvalidated-slim"
77+
"${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.release_info.outputs.RELEASE_VERSION }}-${{ steps.build_variables.outputs.VERSION }}-unvalidated-slim"
78+
- name: Build and publish ubuntu container image
79+
# Only run this on repositories in the 'spinnaker' org, not on forks.
80+
if: startsWith(github.repository, 'spinnaker/')
81+
uses: docker/build-push-action@v2
82+
with:
83+
context: .
84+
file: Dockerfile.ubuntu
85+
push: true
86+
tags: |
87+
"${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.release_info.outputs.RELEASE_VERSION }}-unvalidated-ubuntu"
88+
"${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.release_info.outputs.RELEASE_VERSION }}-${{ steps.build_variables.outputs.VERSION }}-unvalidated-ubuntu"
89+
- name: Create release
90+
if: steps.release_info.outputs.SKIP_RELEASE == 'false'
91+
uses: actions/create-release@v1
92+
env:
93+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
94+
with:
95+
tag_name: ${{ github.ref }}
96+
release_name: ${{ github.event.repository.name }} ${{ github.ref }}
97+
body: |
98+
${{ steps.release_info.outputs.CHANGELOG }}
99+
draft: false
100+
prerelease: ${{ steps.release_info.outputs.IS_CANDIDATE }}

‎.github/workflows/release_info.sh‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
#!/bin/bash -x
2+
3+
# Only look to the latest release to determine the previous tag -- this allows us to skip unsupported tag formats (like `version-1.0.0`)
4+
export PREVIOUS_TAG=`curl --silent "https://api.github.com/repos/$1/releases/latest" | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/'`
5+
echo "PREVIOUS_TAG=$PREVIOUS_TAG"
6+
export NEW_TAG=${GITHUB_REF/refs\/tags\//}
7+
echo "NEW_TAG=$NEW_TAG"
8+
export CHANGELOG=`git log $NEW_TAG...$PREVIOUS_TAG --oneline`
9+
echo "CHANGELOG=$CHANGELOG"
10+
11+
#Format the changelog so it's markdown compatible
12+
CHANGELOG="${CHANGELOG//$'%'/%25}"
13+
CHANGELOG="${CHANGELOG//$'\n'/%0A}"
14+
CHANGELOG="${CHANGELOG//$'\r'/%0D}"
15+
16+
# If the previous release tag is the same as this tag the user likely cut a release (and in the process created a tag), which means we can skip the need to create a release
17+
export SKIP_RELEASE=`[[ "$PREVIOUS_TAG" = "$NEW_TAG" ]] && echo "true" || echo "false"`
18+
19+
# https://github.com/fsaintjacques/semver-tool/blob/master/src/semver#L5-L14
20+
NAT='0|[1-9][0-9]*'
21+
ALPHANUM='[0-9]*[A-Za-z-][0-9A-Za-z-]*'
22+
IDENT="$NAT|$ALPHANUM"
23+
FIELD='[0-9A-Za-z-]+'
24+
SEMVER_REGEX="\
25+
^[vV]?\
26+
($NAT)\\.($NAT)\\.($NAT)\
27+
(\\-(${IDENT})(\\.(${IDENT}))*)?\
28+
(\\+${FIELD}(\\.${FIELD})*)?$"
29+
30+
# Used in downstream steps to determine if the release should be marked as a "prerelease" and if the build should build candidate release artifacts
31+
export IS_CANDIDATE=`[[ $NEW_TAG =~ $SEMVER_REGEX && ! -z ${BASH_REMATCH[4]} ]] && echo "true" || echo "false"`
32+
33+
# This is the version string we will pass to the build, trim off leading 'v' if present
34+
export RELEASE_VERSION=`[[ $NEW_TAG =~ $SEMVER_REGEX ]] && echo "${NEW_TAG:1}" || echo "${NEW_TAG}"`
35+
echo "RELEASE_VERSION=$RELEASE_VERSION"

‎build.gradle‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,11 @@
1515
*/
1616

1717
plugins {
18-
id "io.spinnaker.bintray-publish" version "$spinnakerGradleVersion" apply false
18+
id "io.spinnaker.artifactregistry-publish" version "$spinnakerGradleVersion"
1919
}
2020

2121
subprojects {
2222
apply plugin: 'nebula.ospackage'
23-
apply plugin: 'io.spinnaker.bintray-publish'
2423
group = "com.netflix.spinnaker.monitoring"
2524

2625
tasks.register("publish")

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
spinnakerGradleVersion=8.16.0
1+
spinnakerGradleVersion=8.23.0

0 commit comments

Comments
 (0)