Skip to content

Commit

Permalink
Update actions to current versions & validate gradle
Browse files Browse the repository at this point in the history
Signed-off-by: Nigel Jones <nigel.l.jones+git@gmail.com>
  • Loading branch information
planetf1 committed Nov 17, 2022
1 parent c4b3241 commit dfde62a
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 10 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
uses: actions/checkout@v3
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
uses: github/codeql-action/init@v2
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
Expand All @@ -57,7 +57,7 @@ jobs:
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v1
uses: github/codeql-action/autobuild@v2

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl
Expand All @@ -71,4 +71,4 @@ jobs:
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
uses: github/codeql-action/analyze@v2
6 changes: 4 additions & 2 deletions .github/workflows/merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,16 @@ jobs:
build:
if: startsWith(github.repository,'odpi/')
runs-on: ubuntu-latest

name: "Merge"
steps:
- uses: actions/checkout@v3
- name: Set up JDK
uses: actions/setup-java@v2
uses: actions/setup-java@v3
with:
java-version: 11
distribution: 'temurin'
- uses: gradle/wrapper-validation-action@v1
# Only for a merge into this repo - not a fork, and just for the main branch
- name: Build (Publish snapshots to maven central)
if: ${{ github.ref == 'refs/heads/main'}}
Expand All @@ -37,7 +39,7 @@ jobs:
run: ./gradlew build
# --
- name: Upload Connector
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
# TODO: merge - Update name & artifacts to upload
name: Jar
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ jobs:
- uses: actions/checkout@v3
name: Checkout source
- name: Set up JDK
uses: actions/setup-java@v2
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: '11'

- uses: gradle/wrapper-validation-action@v1
- name: Build with Gradle & Release artifacts
run: ./gradlew publish
# Import secrets needed for code signing and distribution
Expand All @@ -37,7 +37,7 @@ jobs:
OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
# Upload the library so that build results can be viewed
- name: Upload Connector
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
# TODO: release - Update name & artifacts to upload
name: Jar
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/verify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,16 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Set up JDK
uses: actions/setup-java@v2
uses: actions/setup-java@v3
with:
java-version: 11
distribution: 'temurin'
- uses: gradle/wrapper-validation-action@v1
- name: Build
run: ./gradlew build
# --
- name: Upload Connector
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
# TODO: verify - Update name & artifacts to upload
name: Jar
Expand Down

0 comments on commit dfde62a

Please sign in to comment.