remove keycloak ressources from build and test ci docker push

codegouvfr · Mar 20, 2024 · d467bee · d467bee
1 parent 484dad3
commit d467bee
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 11 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -62,8 +62,8 @@ jobs:
 
   docker:
     runs-on: ubuntu-latest
-    needs:
-      - check_if_version_upgraded
+    #    needs:
+    #    - check_if_version_upgraded
     #   - create_github_release
     steps:
       - uses: actions/checkout@v4
@@ -95,12 +95,14 @@ jobs:
           context: .
           target: api
           tags: ${{ steps.step1.outputs.docker_api_tags }}
+#          platforms: linux/amd64,linux/arm64
       - uses: docker/build-push-action@v5
         with:
           push: true
           context: .
           target: web
           tags: ${{ steps.step1.outputs.docker_web_tags }}
+#          platforms: linux/amd64,linux/arm64
 
   # poke_gitops:
   #   runs-on: ubuntu-latest

diff --git a/web/CONTRIBUTING.md b/web/CONTRIBUTING.md
@@ -1,5 +1,5 @@
 Vous pouvez contribuer à ce dépôt de documentation en envoyant des [pull requests](https://github.com/codegouvfr/sill-web/pulls) ou en remontant des [issues](https://github.com/codegouvfr/sill-web/issues).
 
-Pour contribuer au *backend*, voir le dépôt [sill-api](https://github.com/codegouvfr/sill-api/).
+Pour contribuer au _backend_, voir le dépôt [sill-api](https://github.com/codegouvfr/sill-api/).
 
 Pour contribuer à la documentation, voir le dépôt [sill-web](https://github.com/codegouvfr/sill-docs/).
diff --git a/web/package.json b/web/package.json
@@ -5,7 +5,7 @@
     "license": "MIT",
     "scripts": {
         "dev": "react-app-rewired start",
-        "build": "react-app-rewired build",
+        "build": "react-app-rewired build && rimraf build/keycloak-resources",
         "build-keycloak-theme": "yarn build && keycloakify",
         "storybook": "start-storybook -p 6006",
         "_format": "prettier '**/*.{ts,tsx,json,md}'",
@@ -22,7 +22,7 @@
         "@codegouvfr/react-dsfr": "^1.0.0",
         "@emotion/react": "^11.11.0",
         "@emotion/styled": "^11.11.0",
-        "@mui/icons-material": "^5.0.4",
+        "@mui/icons-material": "^5.15.14",
         "@mui/material": "^5.13.3",
         "@storybook/addon-docs": "^6.5.15",
         "@tanstack/react-virtual": "3.0.0-beta.39",
@@ -33,10 +33,10 @@
         "evt": "^2.5.3",
         "flexsearch": "0.7.21",
         "i18nifty": "^3.1.2",
-        "oidc-spa": "^4.0.0",
         "keycloakify": "^9.2.0",
         "memoizee": "^0.4.14",
         "moment": "^2.29.1",
+        "oidc-spa": "^4.0.0",
         "path": "^0.12.7",
         "powerhooks": "^1.0.5",
         "react": "^18.2.0",
@@ -76,6 +76,7 @@
         "node-fetch": "^2.6.1",
         "prettier": "^2.3.0",
         "react-app-rewired": "^2.2.1",
+        "rimraf": "^5.0.5",
         "source-map-explorer": "^2.5.2",
         "storybook-dark-mode": "^2.0.5",
         "ts-node": "^10.2.1",

diff --git a/yarn.lock b/yarn.lock
@@ -2133,10 +2133,10 @@
   resolved "https://registry.yarnpkg.com/@mui/core-downloads-tracker/-/core-downloads-tracker-5.15.12.tgz#f3da6ff16c753ab8b2f8d401c1e1534ba8a8a9a9"
   integrity sha512-brRO+tMFLpGyjEYHrX97bzqeF6jZmKpqqe1rY0LyIHAwP6xRVzh++zSecOQorDOCaZJg4XkGT9xfD+RWOWxZBA==
 
-"@mui/icons-material@^5.0.4":
-  version "5.15.12"
-  resolved "https://registry.yarnpkg.com/@mui/icons-material/-/icons-material-5.15.12.tgz#30638c5dd4d40ecabea1579bbfa7394565c54474"
-  integrity sha512-3BXiDlOd3AexZoEXa/VqpIpVIvosCzjLHsdMWzKMXbZdnBiJjmb9ECdqfjn5SpTClO49qvkKLhkTqdBH3fSFGw==
+"@mui/icons-material@^5.15.14":
+  version "5.15.14"
+  resolved "https://registry.yarnpkg.com/@mui/icons-material/-/icons-material-5.15.14.tgz#333468c94988d96203946d1cfeb8f4d7e8e7de34"
+  integrity sha512-vj/51k7MdFmt+XVw94sl30SCvGx6+wJLsNYjZRgxhS6y3UtnWnypMOsm3Kmg8TN+P0dqwsjy4/fX7B1HufJIhw==
   dependencies:
     "@babel/runtime" "^7.23.9"
 
@@ -9276,7 +9276,7 @@ glob-to-regexp@^0.4.1:
   resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e"
   integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==
 
-glob@^10.2.2, glob@^10.3.10:
+glob@^10.2.2, glob@^10.3.10, glob@^10.3.7:
   version "10.3.10"
   resolved "https://registry.yarnpkg.com/glob/-/glob-10.3.10.tgz#0351ebb809fd187fe421ab96af83d3a70715df4b"
   integrity sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==
@@ -15724,6 +15724,13 @@ rimraf@^3.0.0, rimraf@^3.0.2:
   dependencies:
     glob "^7.1.3"
 
+rimraf@^5.0.5:
+  version "5.0.5"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-5.0.5.tgz#9be65d2d6e683447d2e9013da2bf451139a61ccf"
+  integrity sha512-CqDakW+hMe/Bz202FPEymy68P+G50RfMQK+Qo5YUqc9SPipvbGjCGKd0RSKEelbsfQuw3g5NZDSrlZZAJurH1A==
+  dependencies:
+    glob "^10.3.7"
+
 rimraf@~2.6.2:
   version "2.6.3"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"