Skip to content

Commit 83b132d

Browse files
authored
CI/CD Cleanup (#156)
* CI/CD Cleanup * Restore creation of publish artifacts as part of matrix build as it seems faster
1 parent dff201e commit 83b132d

8 files changed

+105
-494
lines changed

.github/dependabot.yml

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: "github-actions"
4+
directory: "/"
5+
schedule:
6+
interval: "weekly"

.github/release-drafter.yml

+36
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
name-template: 'v$RESOLVED_VERSION'
2+
tag-template: 'v$RESOLVED_VERSION'
3+
template: |
4+
# What's Changed
5+
$CHANGES
6+
categories:
7+
- title: 'Breaking'
8+
label: 'type: breaking'
9+
- title: 'New'
10+
label: 'type: feature'
11+
- title: 'Bug Fixes'
12+
label: 'type: bug'
13+
- title: 'Maintenance'
14+
label: 'type: maintenance'
15+
- title: 'Documentation'
16+
label: 'type: docs'
17+
- title: 'Dependency Updates'
18+
label: 'type: dependencies'
19+
20+
version-resolver:
21+
major:
22+
labels:
23+
- 'type: breaking'
24+
minor:
25+
labels:
26+
- 'type: feature'
27+
patch:
28+
labels:
29+
- 'type: bug'
30+
- 'type: maintenance'
31+
- 'type: docs'
32+
- 'type: dependencies'
33+
- 'type: security'
34+
35+
exclude-labels:
36+
- 'skip-changelog'

.github/workflows/ci-cd.yml

+7-5
Original file line numberDiff line numberDiff line change
@@ -149,16 +149,17 @@ jobs:
149149
out/morphir/${{matrix.scala}}/**/native/
150150
key: ${{ runner.os }}-mill-native-${{matrix.java}}-${{ matrix.scala }}-${{ github.sha }}-${{ hashFiles('out') }}
151151

152-
publish-sonatype:
153-
# when in master repo: all commits to main branch and all additional tags
154-
if: github.repository == 'finos/morphir-jvm' && ( github.ref == 'refs/heads/main' || (github.ref != 'refs/heads/main' && startsWith( github.ref, 'refs/tags/') ) )
152+
cd:
155153
needs: [ci]
156154

157155
runs-on: ubuntu-latest
156+
# when in primary repo: all commits to main branch and all additional tags
157+
if: github.repository == 'finos/morphir-jvm' && ( github.ref == 'refs/heads/main' || (github.ref != 'refs/heads/main' && startsWith( github.ref, 'refs/tags/') ) )
158158

159159
# only run one publish job for the same sha at the same time
160160
# e.g. when a main-branch push is also tagged
161-
concurrency: publish-sonatype-${{ github.sha }}
161+
concurrency:
162+
group: ${{ github.workflow}}-publish-${{ github.sha }}
162163

163164
env:
164165
PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
@@ -260,7 +261,8 @@ jobs:
260261
key: ${{ runner.os }}-mill-native-11-3.3.1-${{ github.sha }}-${{ hashFiles('out') }}
261262
restore-keys: ${{ runner.os }}-mill-native-11-3.3.1-${{ github.sha }}-
262263

263-
- run: ./mill -i -j 0 io.kipp.mill.ci.release.ReleaseModule/publishAll
264+
- name: Publish artifacts to Sonatype
265+
run: ./mill -i -j 0 io.kipp.mill.ci.release.ReleaseModule/publishAll
264266

265267
ci:
266268
runs-on: ubuntu-latest

.github/workflows/ci.yml

-83
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
name: dependency-graph
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
8+
jobs:
9+
submit-dependency-graph:
10+
if: github.repository == 'finos/morphir-scala' && github.ref == 'refs/heads/main'
11+
runs-on: ubuntu-latest
12+
steps:
13+
14+
- uses: actions/checkout@v4
15+
with:
16+
fetch-depth: 0
17+
18+
- uses: coursier/cache-action@v6
19+
20+
- uses: actions/setup-java@v4
21+
with:
22+
distribution: 'temurin'
23+
java-version: '17'
24+
25+
# We want to see the transmitted graph in the logs
26+
- run: ./mill --import ivy:io.chris-kipp::mill-github-dependency-graph::0.2.6 showNamed io.kipp.mill.github.dependency.graph.Graph/generate
27+
28+
# Actually upload the graph
29+
- uses: ckipp01/mill-dependency-submission@v1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
name: 'Dependency Review'
2+
on: [pull_request]
3+
permissions:
4+
contents: read
5+
jobs:
6+
dependency-review:
7+
runs-on: ubuntu-latest
8+
steps:
9+
- name: 'Checkout Repository'
10+
uses: actions/checkout@v4
11+
- name: Dependency Review
12+
uses: actions/dependency-review-action@v3
13+
with:
14+
fail-on-severity: high

0 commit comments

Comments
 (0)