Skip to content

Commit 1ad4183

Browse files
authored
Merge pull request #89 from DataONEorg/develop
Merge develop to main for the 3.0.0 release
2 parents 71a5c14 + 939360d commit 1ad4183

File tree

462 files changed

+190906
-33794
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

462 files changed

+190906
-33794
lines changed

.github/CODEOWNERS

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# This is a comment.
2+
# Each line is a file pattern followed by one or more owners.
3+
4+
# These owners will be the default owners for everything in
5+
# the repo. Unless a later match takes precedence,
6+
# these users will be requested for
7+
# review when someone opens a pull request.
8+
* @mbjones @datadavev @taojing2002

.github/dependabot.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: "maven"
4+
directory: "/"
5+
schedule:
6+
interval: "daily"
7+
target-branch: "develop"
Lines changed: 94 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,94 @@
1+
name: Java Maven Build, Test, and Publish
2+
3+
on:
4+
push:
5+
branches:
6+
- feature*
7+
- develop
8+
- '*-image-auto-publish'
9+
tags: [ 'v*.*.*' ]
10+
11+
env:
12+
# Use docker.io for Docker Hub if empty
13+
REGISTRY: ghcr.io
14+
# github.repository as <account>/<repo>
15+
#IMAGE_NAME: ${{ github.repository }}
16+
IMAGE_NAME: ${{ github.repository_owner }}/dataone-index-worker
17+
18+
jobs:
19+
maven-build:
20+
name: Maven Build and Test
21+
runs-on: ubuntu-latest
22+
outputs:
23+
version: ${{ steps.get_version.outputs.version }}
24+
steps:
25+
- uses: actions/checkout@v3
26+
- name: Set up JDK
27+
uses: actions/setup-java@v3
28+
with:
29+
java-version: '17'
30+
distribution: 'temurin'
31+
cache: 'maven'
32+
33+
- name: Extract Maven project version
34+
run: echo "version="$(mvn -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec) >> $GITHUB_OUTPUT
35+
id: get_version
36+
#- name: Show extracted Maven project version
37+
#run: echo "Version from pom: " ${{ steps.get_version.outputs.version }}
38+
39+
- name: Build and Test
40+
run: mvn --batch-mode --update-snapshots test
41+
- name: Package
42+
run: mvn --batch-mode --update-snapshots -DskipTests=true package
43+
- uses: actions/cache@v3
44+
with:
45+
path: .
46+
key: builddir-${{ github.run_id }}
47+
48+
docker-publish:
49+
name: Docker Build and Publish
50+
if: github.ref_name == 'develop' || github.ref_name == 'v*.*.*'
51+
needs: maven-build
52+
runs-on: ubuntu-latest
53+
permissions:
54+
contents: read
55+
packages: write
56+
57+
steps:
58+
- uses: actions/cache@v3
59+
with:
60+
path: .
61+
key: builddir-${{ github.run_id }}
62+
63+
- name: Set up Docker Buildx
64+
uses: docker/setup-buildx-action@v2
65+
66+
# Login against a Docker registry except on PR
67+
# https://github.com/docker/login-action
68+
- name: Log into registry ${{ env.REGISTRY }}
69+
if: github.event_name != 'pull_request'
70+
uses: docker/login-action@v2
71+
with:
72+
registry: ${{ env.REGISTRY }}
73+
username: ${{ github.actor }}
74+
password: ${{ secrets.GITHUB_TOKEN }}
75+
76+
# Extract metadata (tags, labels) for Docker
77+
# https://github.com/docker/metadata-action
78+
- name: Extract Docker metadata
79+
id: meta
80+
uses: docker/metadata-action@v4
81+
with:
82+
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
83+
84+
# Build and push Docker image with Buildx (don't push on PR)
85+
# https://github.com/docker/build-push-action
86+
- name: Build and push Docker image
87+
uses: docker/build-push-action@v3
88+
with:
89+
context: .
90+
file: docker/Dockerfile
91+
build-args: TAG=${{needs.maven-build.outputs.version}}
92+
push: ${{ github.event_name != 'pull_request' }}
93+
tags: ${{ steps.meta.outputs.tags }}
94+
labels: ${{ steps.meta.outputs.labels }}

.github/workflows/build.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ on:
55
workflow_dispatch:
66
push:
77
branches:
8-
- develop*
8+
- main
9+
#- develop
910

1011
jobs:
1112
build:

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
11
.idea
22
target
3+
.java-version
4+
tlog/
5+
charts/

0 commit comments

Comments
 (0)