Use single fractal-web reference config file

fractal-analytics-platform · Dec 10, 2024 · 576c6bf · 576c6bf
1 parent d72c03b
commit 576c6bf
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/.github/workflows/documentation.yaml b/.github/workflows/documentation.yaml
@@ -25,10 +25,15 @@ jobs:
         with:
           path: MAIN
 
+      - name: Set fractal-web reference
+        run: |
+          FRACTAL_WEB_REFERENCE=$(cat fractal-web-reference.txt)
+          echo "FRACTAL_WEB_REFERENCE=$FRACTAL_WEB_REFERENCE" >> $GITHUB_ENV
+  
       - uses: actions/checkout@v4
         with:
           repository: fractal-analytics-platform/fractal-web
-          ref: tasks-list-module  # FIXME: replace with main (or latest tag?)
+          ref: ${{ env.FRACTAL_WEB_REFERENCE }}
           path: WEB
           sparse-checkout: |
             components

diff --git a/docs/available_tasks.md b/docs/available_tasks.md
@@ -24,4 +24,4 @@ hide:
 </iframe>
 
 
-(last updated: LASTUPDATEDPLACEHOLDER)
+(last build on LASTUPDATEDPLACEHOLDER, with `fractal-web` FRACTALWEBREFERENCEPLACEHOLDER)
diff --git a/fractal-web-reference.txt b/fractal-web-reference.txt
@@ -0,0 +1 @@
+b044c44a7b3acd01f5b91b295eac0b97516ad74d
diff --git a/tools/full_local_build.sh b/tools/full_local_build.sh
@@ -4,8 +4,7 @@ set -e
 
 date
 
-FRACTAL_WEB_REF=b044c44a7b3acd01f5b91b295eac0b97516ad74d
-
+FRACTAL_WEB_REFERENCE=$(cat fractal-web-reference.txt)
 
 CURRENT_DIR=$(pwd)
 WEBDIR="/tmp/WEB"
@@ -26,7 +25,7 @@ ls -lh tasks_data_retrieval/tasks.json
 # Build
 git clone [email protected]:fractal-analytics-platform/fractal-web "$WEBDIR"
 cd "$WEBDIR"
-git checkout "$FRACTAL_WEB_REF"
+git checkout "$FRACTAL_WEB_REFERENCE"
 cd "$WEBDIR/components/"
 npm install
 cd "$WEBDIR/tasks-list"
@@ -36,8 +35,10 @@ npm run build
 cp -r build "$CURRENT_DIR/site/fractal-tasks"
 
 CURRENT_DATE=$(date)
-sed -i'.bak' "s/LASTUPDATEDPLACEHOLDER/$CURRENT_DATE/" "$CURRENT_DIR/site/available_tasks/index.html"
-rm "$CURRENT_DIR/site/available_tasks/index.html.bak"
+sed -i'.bak1' "s/LASTUPDATEDPLACEHOLDER/$CURRENT_DATE/" "$CURRENT_DIR/site/available_tasks/index.html"
+sed -i'.bak2' "s/FRACTALWEBREFERENCEPLACEHOLDER/$FRACTAL_WEB_REFERENCE/" "$CURRENT_DIR/site/available_tasks/index.html"
+rm "$CURRENT_DIR/site/available_tasks/index.html.bak1"
+rm "$CURRENT_DIR/site/available_tasks/index.html.bak2"
 
 
 deactivate
Original file line number	Diff line number	Diff line change
Expand Up		@@ -24,4 +24,4 @@ hide:
		</iframe>


		(last updated: LASTUPDATEDPLACEHOLDER)
		(last build on LASTUPDATEDPLACEHOLDER, with `fractal-web` FRACTALWEBREFERENCEPLACEHOLDER)