Skip to content

Commit

Permalink
update gh action build
Browse files Browse the repository at this point in the history
Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
  • Loading branch information
lukasj committed Jun 27, 2024
1 parent a235dbe commit c1e4b66
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 18 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2022, 2024 Oracle and/or its affiliates. All rights reserved.
#
# This program and the accompanying materials are made available under the
# terms of the Eclipse Distribution License v. 1.0, which is available at
Expand Down Expand Up @@ -37,7 +37,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up JDK
uses: actions/setup-java@v2
Expand All @@ -54,11 +54,11 @@ jobs:
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.

# Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
# queries: security-extended,security-and-quality


# 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
Expand All @@ -67,7 +67,7 @@ jobs:
# ℹ️ Command-line programs to run using the OS shell.
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun

# If the Autobuild fails above, remove it and uncomment the following three lines.
# If the Autobuild fails above, remove it and uncomment the following three lines.
# modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.

- run: |
Expand Down
25 changes: 12 additions & 13 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (c) 2022, 2023 Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2022, 2024 Oracle and/or its affiliates. All rights reserved.
#
# This program and the accompanying materials are made available under the
# terms of the Eclipse Distribution License v. 1.0, which is available at
Expand All @@ -12,9 +12,13 @@ name: JAXWS RI

on: [push, pull_request]

concurrency:
group: ${{ github.ref }}
cancel-in-progress: true

jobs:
build:
name: Test on JDK ${{ matrix.java_version }}
name: Test on JDK ${{ matrix.java_version }}
runs-on: ubuntu-latest
outputs:
jdk: ${{ steps.build.outputs.jdk }}
Expand All @@ -23,17 +27,12 @@ jobs:
java_version: [ 17 ]

steps:
- name: Cancel previous runs of this workflow
uses: styfle/cancel-workflow-action@0.11.0
with:
all_but_latest: true
access_token: ${{ github.token }}
- name: Checkout for build
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Set up JDK
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: ${{ matrix.java_version }}
Expand All @@ -46,7 +45,7 @@ jobs:
cd ..
echo "::set-output name=jdk::${{ matrix.java_version }}"
- name: Upload binary image
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: success()
with:
name: binary
Expand All @@ -64,16 +63,16 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Set up JDK
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: ${{ needs.build.outputs.jdk }}
- name: Checkout tests
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Download binaries
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: binary
- name: Test
Expand Down

0 comments on commit c1e4b66

Please sign in to comment.