diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fd40fd797d3b34f6e2407e465a2a89f6b7cc87a6..df8e1eb3ee32b9bfaa26c713b8b4e8a9b1fa653d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,7 +11,7 @@
image: node:20
stages:
- - test
+ # - test
- build
- deploy
- teardown
@@ -45,15 +45,15 @@ stages:
- echo "$SSH_PRIVATE_KEY_DEPLOY_FRONT_ED25519" | tr -d '\r' | ssh-add -
- echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config
-quality-gate:
- image: mcr.microsoft.com/playwright:v1.47.1-noble
- stage: test
- only:
- - merge_requests
- script:
- - npm ci
- - npm run lint
- - npm run test:unit
+# quality-gate:
+# image: mcr.microsoft.com/playwright:v1.47.1-noble
+# stage: test
+# only:
+# - merge_requests
+# script:
+# - npm ci
+# - npm run lint
+# - npm run test:unit
build:
stage: build
@@ -73,19 +73,19 @@ build:
paths:
- ./dist/
-build-storybook:
- stage: build
- only:
- - tags
- - merge_requests
- - main
- script:
- - npm ci
- - npm run build-storybook
- artifacts:
- expire_in: 3 week
- paths:
- - ./storybook-static/
+# build-storybook:
+# stage: build
+# only:
+# - tags
+# - merge_requests
+# - main
+# script:
+# - npm ci
+# - npm run build-storybook
+# artifacts:
+# expire_in: 3 week
+# paths:
+# - ./storybook-static/
deploy:
<<: *check_ssh
@@ -103,9 +103,21 @@ deploy:
- apt install rsync -y
- echo "Will deploy to ${DELIVERY_DIRECTORY}"
-
+ # - echo "
+ # <Directory "/var/www/html/$DELIVERY_DIRECTORY">
+ # FallbackResource /$DELIVERY_DIRECTORY/index.html
+ # </Directory>
+ # <Directory "./">
+ # FallbackResource ./index.html
+ # </Directory>
+ # " >> ./dist/.htaccess
+
+ # - ssh gitlab@so-frontend-dev.irit.fr "ls -al /var/www/html${DELIVERY_DIRECTORY}"
+ # - ssh gitlab@so-frontend-dev.irit.fr "more /var/www/html${DELIVERY_DIRECTORY}/.htaccess"
- ssh gitlab@so-frontend-dev.irit.fr "rm -rf /var/www/html${DELIVERY_DIRECTORY}"
- rsync -ravP --delete ./dist/ gitlab@so-frontend-dev.irit.fr:/var/www/html${DELIVERY_DIRECTORY}/
+ - ssh gitlab@so-frontend-dev.irit.fr "ls -al /var/www/html${DELIVERY_DIRECTORY}"
+ - ssh gitlab@so-frontend-dev.irit.fr "more /var/www/html${DELIVERY_DIRECTORY}/.htaccess"
# Copie de la dernière version commiter sur le main sur le chemin /last aussi
# - if [ "$CI_COMMIT_BRANCH" == "main" ]; then rsync -rav --delete ./dist gitlab@so-frontend-dev.irit.fr:/var/www/html/mvp-last; fi
@@ -115,33 +127,33 @@ deploy:
auto_stop_in: 2 months
on_stop: teardown
-deploy-storybook:
- <<: *check_ssh
- stage: deploy
- variables:
- DELIVERY_DIRECTORY_STORYBOOK: '/mvps-${CI_COMMIT_REF_SLUG}'
- only:
- - tags
- - merge_requests
- - main
- dependencies:
- - build-storybook
- script:
- - apt update
- - apt install rsync -y
-
- - echo "Will deploy to ${DELIVERY_DIRECTORY_STORYBOOK}"
-
- - ssh gitlab@so-frontend-dev.irit.fr "rm -rf /var/www/html${DELIVERY_DIRECTORY_STORYBOOK}"
- - rsync -ravP --delete ./storybook-static/ gitlab@so-frontend-dev.irit.fr:/var/www/html${DELIVERY_DIRECTORY_STORYBOOK}/
-
- # Copie de la dernière version commiter sur le main sur le chemin /last aussi
- # - if [ "$CI_COMMIT_BRANCH" == "main" ]; then rsync -rav --delete ./dist gitlab@so-frontend-dev.irit.fr:/var/www/html/mvp-last; fi
- environment:
- name: review/mvps-${CI_COMMIT_REF_SLUG}
- url: https://opencommon.irit.fr/mvps-${CI_COMMIT_REF_SLUG}
- auto_stop_in: 2 months
- on_stop: teardown-storybook
+# deploy-storybook:
+# <<: *check_ssh
+# stage: deploy
+# variables:
+# DELIVERY_DIRECTORY_STORYBOOK: '/mvps-${CI_COMMIT_REF_SLUG}'
+# only:
+# - tags
+# - merge_requests
+# - main
+# dependencies:
+# - build-storybook
+# script:
+# - apt update
+# - apt install rsync -y
+
+# - echo "Will deploy to ${DELIVERY_DIRECTORY_STORYBOOK}"
+
+# - ssh gitlab@so-frontend-dev.irit.fr "rm -rf /var/www/html${DELIVERY_DIRECTORY_STORYBOOK}"
+# - rsync -ravP --delete ./storybook-static/ gitlab@so-frontend-dev.irit.fr:/var/www/html${DELIVERY_DIRECTORY_STORYBOOK}/
+
+# # Copie de la dernière version commiter sur le main sur le chemin /last aussi
+# # - if [ "$CI_COMMIT_BRANCH" == "main" ]; then rsync -rav --delete ./dist gitlab@so-frontend-dev.irit.fr:/var/www/html/mvp-last; fi
+# environment:
+# name: review/mvps-${CI_COMMIT_REF_SLUG}
+# url: https://opencommon.irit.fr/mvps-${CI_COMMIT_REF_SLUG}
+# auto_stop_in: 2 months
+# on_stop: teardown-storybook
teardown:
<<: *check_ssh
@@ -159,18 +171,18 @@ teardown:
- echo "Fin de la MR => on supprime le répertoire déployé $DELIVERY_DIRECTORY"
- ssh gitlab@so-frontend-dev.irit.fr "rm -rf /var/www/html${DELIVERY_DIRECTORY}"
-teardown-storybook:
- <<: *check_ssh
- stage: teardown
- only:
- - merge_requests
- variables:
- GIT_STRATEGY: none
- DELIVERY_DIRECTORY_STORYBOOK: '/mvps-${CI_COMMIT_REF_SLUG}'
- when: manual
- environment:
- name: review/mvps-${CI_COMMIT_REF_SLUG}
- action: stop
- script:
- - echo "Fin de la MR => on supprime le répertoire storybook déployé $DELIVERY_DIRECTORY_STORYBOOK"
- - ssh gitlab@so-frontend-dev.irit.fr "rm -rf /var/www/html${DELIVERY_DIRECTORY_STORYBOOK}"
+# teardown-storybook:
+# <<: *check_ssh
+# stage: teardown
+# only:
+# - merge_requests
+# variables:
+# GIT_STRATEGY: none
+# DELIVERY_DIRECTORY_STORYBOOK: '/mvps-${CI_COMMIT_REF_SLUG}'
+# when: manual
+# environment:
+# name: review/mvps-${CI_COMMIT_REF_SLUG}
+# action: stop
+# script:
+# - echo "Fin de la MR => on supprime le répertoire storybook déployé $DELIVERY_DIRECTORY_STORYBOOK"
+# - ssh gitlab@so-frontend-dev.irit.fr "rm -rf /var/www/html${DELIVERY_DIRECTORY_STORYBOOK}"
diff --git a/public/.htaccess b/public/.htaccess
new file mode 100644
index 0000000000000000000000000000000000000000..1290baaa0f96d82a21c92c82b5bbe0ac797bf558
--- /dev/null
+++ b/public/.htaccess
@@ -0,0 +1,6 @@
+<Directory "/var/www/html/mvp-36-apache">
+ FallbackResource /mvp-36-apache/index.html
+</Directory>
+<Directory "./">
+ FallbackResource ./index.html
+</Directory>