Skip to content

Commit

Permalink
Fix github actions
Browse files Browse the repository at this point in the history
  • Loading branch information
ebocher committed Nov 8, 2024
1 parent 0f68f64 commit 2d50b2d
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 17 deletions.
19 changes: 11 additions & 8 deletions .github/workflows/CI release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,15 @@ jobs:
- name: Checkout
uses: actions/checkout@v4

# Install the GPG secret key
- name: Import GPG Key
run: |
echo "${{ secrets.GPG_PUBLIC_KEY }}" | gpg --import
echo "${{ secrets.GPG_SECRET_KEY }}" | gpg --import --no-tty --batch --yes
env:
GPG_PUBLIC_KEY: ${{ secrets.GPG_PUBLIC_KEY }}
GPG_SECRET_KEY: ${{ secrets.GPG_SECRET_KEY }}

# Setup the jdk using version 11 of Adoptium Temurin
- name: Setup java 11 using Adoptium Temurin
uses: actions/setup-java@v4
Expand All @@ -25,7 +34,7 @@ jobs:
server-id: ossrh
server-username: MAVEN_USERNAME
server-password: MAVEN_PASSWORD
gpg-private-key: ${{ secrets.GPG_SIGNING_KEY }}
gpg-private-key: ${{ secrets.GPG_SECRET_KEY }}
gpg-passphrase: MAVEN_GPG_PASSPHRASE

# Setup postgis test DB
Expand All @@ -44,12 +53,6 @@ jobs:
git config user.email "[email protected]"
git config user.name OrbisGIS
#Install the GPG secret key
- name: Install gpg secret key
run: |
cat <(echo -e "${{ secrets.OSSRH_GPG_SECRET_KEY }}") | gpg --batch --import
gpg --list-secret-keys --keyid-format LONG
# Test build
- name: Build test
run: mvn -ntp clean validate compile test javadoc:test-javadoc javadoc:jar
Expand All @@ -72,7 +75,7 @@ jobs:
env:
MAVEN_USERNAME: ${{ secrets.MVN_CENTRAL_USERNAME }}
MAVEN_PASSWORD: ${{ secrets.MVN_CENTRAL_PASSWORD }}
MAVEN_GPG_PASSPHRASE: ${{ secrets.OSSRH_GPG_PASSWORD }}
MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}

# Export the last git tag into env.
- name: Export env values
Expand Down
18 changes: 11 additions & 7 deletions .github/workflows/CI snapshot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,15 @@ jobs:
- name: Checkout
uses: actions/checkout@v4

# Install the GPG secret key
- name: Import GPG Key
run: |
echo "${{ secrets.GPG_PUBLIC_KEY }}" | gpg --import
echo "${{ secrets.GPG_SECRET_KEY }}" | gpg --import --no-tty --batch --yes
env:
GPG_PUBLIC_KEY: ${{ secrets.GPG_PUBLIC_KEY }}
GPG_SECRET_KEY: ${{ secrets.GPG_SECRET_KEY }}

# Setup the jdk using version 11 of Adoptium Temurin
- name: Setup java 11 using Adoptium Temurin
uses: actions/setup-java@v4
Expand All @@ -28,7 +37,7 @@ jobs:
server-id: ossrh
server-username: MAVEN_USERNAME
server-password: MAVEN_PASSWORD
gpg-private-key: ${{ secrets.GPG_SIGNING_KEY }}
gpg-private-key: ${{ secrets.GPG_SECRET_KEY }}
gpg-passphrase: MAVEN_GPG_PASSPHRASE

# Setup postgis test DB
Expand All @@ -41,16 +50,11 @@ jobs:
db_user: 'orbisgis'
db_name: 'orbisgis_db'

# Install the GPG secret key
- name: Install gpg secret key
run: |
cat <(echo -e "${{ secrets.OSSRH_GPG_SECRET_KEY }}") | gpg --batch --import
gpg --list-secret-keys --keyid-format LONG

# Deploy the snapshot
- name: Deploy
run: mvn deploy -ntp --batch-mode
env:
MAVEN_USERNAME: ${{ secrets.MVN_CENTRAL_USERNAME }}
MAVEN_PASSWORD: ${{ secrets.MVN_CENTRAL_PASSWORD }}
MAVEN_GPG_PASSPHRASE: ${{ secrets.OSSRH_GPG_PASSWORD }}
MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
3 changes: 2 additions & 1 deletion docs/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@
- Update to H2GIS 2.2.2-SNAPSHOT
- Use new sonatype auth
- Upgrade many deps : H2, Groovy, Apache Common, JTS
- Clean data API
- Clean data API
- Fix GitHub actions
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -610,7 +610,7 @@
<connection>scm:git:https://github.com/orbisgis/orbisdata.git</connection>
<developerConnection>scm:git:https://github.com/orbisgis/orbisdata.git</developerConnection>
<url>[email protected]:orbisgis/orbisdata.git</url>
<tag>HEAD</tag>
<tag>HEAD</tag>
</scm>

<repositories>
Expand Down

0 comments on commit 2d50b2d

Please sign in to comment.