diff --git a/keycloak.yaml b/keycloak.yaml index 73a630086ef..f111e4f0e65 100644 --- a/keycloak.yaml +++ b/keycloak.yaml @@ -1,6 +1,6 @@ package: name: keycloak - version: 25.0.6 + version: 26.0.1 epoch: 0 description: Open Source Identity and Access Management For Modern Applications and Services copyright: @@ -23,9 +23,10 @@ environment: contents: packages: - bash + - build-base - busybox - ca-certificates-bundle - - nodejs-18 + - gcc-13-default - openjdk-17 - openjdk-17-default-jvm - wolfi-base @@ -39,20 +40,24 @@ pipeline: with: repository: https://github.com/keycloak/keycloak tag: ${{package.version}} - expected-commit: ab33487eb861829395214506c14928ed13342a2e + expected-commit: 715b95b4e6fd333658f5e0649caa8f3d1761e3ff - uses: maven/pombump + - runs: | + gcc napi-static-assert.c -o /tmp/preload.so -fPIC -shared -ldl + - runs: | # Keycloak installation. Note we use the maven wrapper as configured in # the source repo to build - ensures the correct maven version for # building the project, preventing issues such as CI hangs. - # Build and install child module (keycloak-js-adapter-jar) - ./mvnw clean install -Dnode.version=$(node --version) -f adapters/oidc/js/pom.xml -q - # Build keycloak-server. Depends on `keycloak-js-adapter-jar`. - ./mvnw clean install -DskipTests=true -Dnode.version=$(node --version) -Pdistribution -q + # Gross hack to work around broken NAPI ast-grep module that has + # undefined symbol: static_assert + export LD_PRELOAD=/tmp/preload.so + ./mvnw clean install -DskipTests=true -Pdistribution -q + unset LD_PRELOAD mkdir -p ${{targets.destdir}}/usr/share/java unzip -d ${{targets.destdir}}/usr/share/java quarkus/dist/target/keycloak-*.zip diff --git a/keycloak/napi-static-assert.c b/keycloak/napi-static-assert.c new file mode 100644 index 00000000000..6b36592722c --- /dev/null +++ b/keycloak/napi-static-assert.c @@ -0,0 +1,3 @@ +int static_assert(void *f()) { + return 0; +}