#6

Author: garronej

.github/workflows/ci.yaml

@@ -9,32 +9,22 @@ on:
 
 jobs:
 
-  build:
+  test:
     runs-on: ubuntu-latest
-    if: github.event.head_commit.author.name != 'actions'
     steps:
     - uses: actions/checkout@v2
-    - uses: actions/[email protected]
-      with:
-        node-version: '16'
+    - uses: actions/setup-node@v2
     - uses: bahmutov/npm-install@v1
     - run: yarn build
     - run: npx keycloakify
       env:
         XDG_CACHE_HOME: "/home/runner/.cache/yarn"
-    - uses: actions/upload-artifact@v2
-      with:
-        name: standalone_keycloak_theme
-        path: build_keycloak/target/*keycloak-theme*.jar
-    - uses: actions/upload-artifact@v2
-      with:
-        name: build
-        path: build
 
   check_if_version_upgraded:
     name: Check if version upgrade
+    if: github.event_name == 'push'
     runs-on: ubuntu-latest
-    needs: build
+    needs: test
     outputs:
       from_version: ${{ steps.step1.outputs.from_version }}
       to_version: ${{ steps.step1.outputs.to_version }}
@@ -44,34 +34,33 @@ jobs:
       id: step1
       with: 
         action_name: is_package_json_version_upgraded
+        branch: ${{ github.head_ref || github.ref }}
 
   create_github_release:
     runs-on: ubuntu-latest
-    needs: 
-      - check_if_version_upgraded
+    needs: check_if_version_upgraded
     # We create a release only if the version have been upgraded and we are on a default branch
-    # PR on the default branch can release beta but not real release
-    if: |
-      needs.check_if_version_upgraded.outputs.is_upgraded_version == 'true' &&
-      (
-        github.event_name == 'push' ||
-        needs.check_if_version_upgraded.outputs.is_release_beta == 'true'
-      )
+    if: needs.check_if_version_upgraded.outputs.is_upgraded_version == 'true' && github.event_name == 'push'
     steps:
-    - run: mkdir jars
-    - uses: actions/download-artifact@v2
-      with:
-        name: standalone_keycloak_theme
-    - run: mv *keycloak-theme*.jar jars/keycloak-theme-dsfr.jar
+    - uses: actions/checkout@v2
+    - uses: actions/setup-node@v2
+    - uses: bahmutov/npm-install@v1
+    - run: yarn build
+    - run: npx keycloakify
+      env:
+        XDG_CACHE_HOME: "/home/runner/.cache/yarn"
+    - run: mv build_keycloak/target/retrocompat-*.jar retrocompat-keycloak-theme.jar
+    - run: mv build_keycloak/target/*.jar keycloak-theme.jar
     - uses: softprops/action-gh-release@v1
       with:
         name: Release v${{ needs.check_if_version_upgraded.outputs.to_version }}
         tag_name: v${{ needs.check_if_version_upgraded.outputs.to_version }}
         target_commitish: ${{ github.head_ref || github.ref }}
         generate_release_notes: true
-        files: |
-          jars/keycloak-theme-dsfr.jar
         draft: false
-        prerelease: ${{ needs.check_if_version_upgraded.outputs.is_release_beta == 'true' }}
+        files: |
+          retrocompat-keycloak-theme.jar
+          keycloak-theme.jar
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+

package.json

@@ -37,7 +37,7 @@
         "@storybook/addon-docs": "^6.5.15",
         "@tanstack/react-virtual": "3.0.0-beta.39",
         "i18nifty": "^1.5.12",
-        "keycloakify": "^8.0.0",
+        "keycloakify": "^9.1.10",
         "react": "^18.2.0",
         "react-dom": "^18.2.0",
         "react-scripts": "5.0.1",

yarn.lock

@@ -10111,10 +10111,10 @@ jwt-decode@^3.1.2:
   resolved "https://registry.yarnpkg.com/jwt-decode/-/jwt-decode-3.1.2.tgz#3fb319f3675a2df0c2895c8f5e9fa4b67b04ed59"
   integrity sha512-UfpWE/VZn0iP50d8cz9NrZLM9lSWhcJ+0Gt/nm4by88UL+J1SiKN8/5dkjMmbEzwL2CAe+67GsegCbIKtbp75A==
 
-keycloakify@^8.0.0:
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/keycloakify/-/keycloakify-8.0.0.tgz#b0f6a0fda34e8601f735df25b24909433a6b5fd3"
-  integrity sha512-/A6Uh9SuVdTP7cix8yS15Vfr03BwVFP11s3YPmQ9dSJN1GrIqzRs6mjTEnogM/ZfhySJwyXSeqTtpCGlXmtxJQ==
+keycloakify@^9.1.10:
+  version "9.1.10"
+  resolved "https://registry.yarnpkg.com/keycloakify/-/keycloakify-9.1.10.tgz#048dd0c40fa6bbe25aec23f4deb803db24a7542e"
+  integrity sha512-BIXuiHLLtz/B04uHwE6jrzIgEPcfrFzGZDRB8HMfCFkgz30RJrf+7arFnYBwvFNs7hcwZOJzJyVIVQb0ixPxrw==
   dependencies:
     "@babel/generator" "^7.22.9"
     "@babel/parser" "^7.22.7"