Skip to content
This repository has been archived by the owner on Nov 6, 2024. It is now read-only.

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
QubitPi committed Apr 2, 2024
1 parent b5dfc87 commit 61fc296
Show file tree
Hide file tree
Showing 13 changed files with 60 additions and 46 deletions.
19 changes: 0 additions & 19 deletions .github/tag-for-release.bash

This file was deleted.

6 changes: 0 additions & 6 deletions .github/upversion.py

This file was deleted.

59 changes: 49 additions & 10 deletions .github/workflows/ci-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,6 @@ jobs:
- uses: actionshub/markdownlint@main
with:
filesToIgnoreRegex: "docs/node_modules\\/.*"
# markdown-link-check:
# name: Markdown Link Check
# runs-on: ubuntu-latest
# steps:
# - uses: actions/checkout@v3
# - uses: gaurav-nelson/github-action-markdown-link-check@v1
# with:
# use-verbose-mode: "yes"

tests:
name: Unit & Integration Tests
Expand All @@ -65,8 +57,6 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0
- uses: actions/setup-python@v4
with:
python-version: '3.8'
Expand Down Expand Up @@ -131,3 +121,52 @@ jobs:
context: athena-examples/athena-example-books
push: true
tags: ${{ secrets.DOCKERHUB_USERNAME }}/athena-example-books:latest

push-release-tag:
if: github.ref == 'refs/heads/master'
uses: QubitPi/hashicorp-aws/.github/workflows/version-bump.yml@master
with:
user: QubitPi
email: jack20220723@gmail.com

release:
name: Release athena to Maven Central
if: github.ref == 'refs/heads/master'
needs: push-release-tag
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Set up JDK
uses: QubitPi/hashicorp-aws/.github/actions/jdk-setup@master
- name: Configure settings.xml for Maven Central release
uses: whelk-io/maven-settings-xml-action@v20
with:
servers: >
[
{
"id": "paion-data",
"username": "${{ secrets.MAVEN_CENTRAL_USERNAME }}",
"password": "${{ secrets.MAVEN_CENTRAL_TOKEN }}",
"passphrase": "${{ secrets.GPG_PASSPHRASE }}"
}
]
profiles: >
[
{
"id": "paion-data",
"properties": {
"gpg.keyname": "paion-data"
}
"activation": {
"activeByDefault": "true"
}
}
]
- name: Bump version
run: |
VERSION=$(git describe)
echo "INFO Last tag: $VERSION"
mvn versions:set -DnewVersion=$VERSION -DgenerateBackupPoms=false
mvn versions:update-property -Dproperty=version.athena -DnewVersion=$VERSION -DgenerateBackupPoms=false
- name: Release
run: mvn clean deploy -DskipTests
2 changes: 1 addition & 1 deletion athena-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.paiondata.athena</groupId>
<artifactId>athena-parent-pom</artifactId>
<version>0.0.3</version>
<version>1.0.0</version>
</parent>

<artifactId>athena-core</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion athena-examples/athena-example-books/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ FROM jetty:jdk17
LABEL maintainer="Jiaqi (Jack) Liu"
LABEL maintainer-email="jack20220723@gmail.com"

ARG ATHENA_VERSION=0.0.3
ARG ATHENA_VERSION=1.0.0

ENV JETTY_WEBAPPS_DIR /var/lib/jetty/webapps

Expand Down
2 changes: 1 addition & 1 deletion athena-examples/athena-example-books/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.paiondata.athena</groupId>
<artifactId>athena-examples</artifactId>
<version>0.0.3</version>
<version>1.0.0</version>
</parent>

<artifactId>athena-example-books</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion athena-examples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.paiondata.athena</groupId>
<artifactId>athena-parent-pom</artifactId>
<version>0.0.3</version>
<version>1.0.0</version>
</parent>

<artifactId>athena-examples</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion athena-filestore/athena-filestore-swift/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.paiondata.athena</groupId>
<artifactId>athena-filestore</artifactId>
<version>0.0.3</version>
<version>1.0.0</version>
</parent>

<artifactId>athena-filestore-swift</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion athena-filestore/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.paiondata.athena</groupId>
<artifactId>athena-parent-pom</artifactId>
<version>0.0.3</version>
<version>1.0.0</version>
</parent>

<artifactId>athena-filestore</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion athena-metastore/athena-metastore-graphql/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.paiondata.athena</groupId>
<artifactId>athena-metastore</artifactId>
<version>0.0.3</version>
<version>1.0.0</version>
</parent>

<artifactId>athena-metastore-graphql</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion athena-metastore/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.paiondata.athena</groupId>
<artifactId>athena-parent-pom</artifactId>
<version>0.0.3</version>
<version>1.0.0</version>
</parent>

<artifactId>athena-metastore</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion athena-system-config/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.paiondata.athena</groupId>
<artifactId>athena-parent-pom</artifactId>
<version>0.0.3</version>
<version>1.0.0</version>
</parent>

<artifactId>athena-system-config</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>com.paiondata.athena</groupId>
<artifactId>athena-parent-pom</artifactId>
<version>0.0.3</version>
<version>1.0.0</version>
<packaging>pom</packaging>

<name>Athena: Parent POM</name>
Expand Down Expand Up @@ -55,7 +55,7 @@
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>

<version.athena>0.0.3</version.athena>
<version.athena>1.0.0</version.athena>
<version.validation.api>3.0.1</version.validation.api>
<version.jcip.annotations>1.0</version.jcip.annotations>
<version.slf4j>1.7.25</version.slf4j>
Expand Down

0 comments on commit 61fc296

Please sign in to comment.