Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 37 additions & 12 deletions .github/workflows/lint.yaml β†’ .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
name: "Lint Pull Request"
name: "Build Kroxylicious"

on:
push:
Expand All @@ -27,7 +27,7 @@ concurrency:
cancel-in-progress: true

jobs:
lint:
compile-jars:
runs-on: ubuntu-latest

steps:
Expand All @@ -46,6 +46,40 @@ jobs:
path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-m2
- name: 'Compile and lint the project'
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
mvn -B -T1.5C package -DskipTests -Dquick
- name: 'Archive Production Artifacts'
uses: actions/upload-artifact@v4
with:
name: built-targets
path: '**/target'
lint:
runs-on: ubuntu-latest
needs: compile-jars
steps:
- name: 'Check out repository'
uses: actions/checkout@v5
with:
fetch-depth: 0
- name: 'Set up Java'
uses: actions/setup-java@v5
with:
java-version: 21
distribution: 'temurin'
- name: 'Cache Maven packages'
uses: actions/cache/restore@v4
with:
path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-m2
- name: Download Built Code
uses: actions/download-artifact@v4
with:
name: built-targets
path: .
- name: 'Compile and lint the project'
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand All @@ -64,13 +98,4 @@ jobs:
"./.git/*"
"**/target"
check_all_files_with_shebangs: "false" # Optional.
shellcheck_flags: "--external-sources --severity=Error"
- name: Save PR number to file
if: github.event_name == 'pull_request'
run: echo ${{ github.event.number }} > PR_NUMBER.txt
- name: Archive PR number
if: github.event_name == 'pull_request'
uses: actions/upload-artifact@v4
with:
name: PR_NUMBER
path: PR_NUMBER.txt
shellcheck_flags: "--external-sources --severity=Error"
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
@RestoreSystemProperties
class OauthBearerValidationIT {

private static final DockerImageName DOCKER_IMAGE_NAME = DockerImageName.parse("ghcr.io/navikt/mock-oauth2-server:2.2.1");
private static final DockerImageName DOCKER_IMAGE_NAME = DockerImageName.parse("ghcr.io/navikt/mock-oauth2-server:2.3.0");

private static final int OAUTH_SERVER_PORT = 28089;
private static final String JWKS_ENDPOINT_URL = "http://localhost:" + OAUTH_SERVER_PORT + "/default/jwks";
Expand Down