removed index changes from test file, edit assets command before checkout and edit genrate index html

ltekbas · ltekbas · commit 9b076054a765 · 2025-09-22T11:31:19.000+02:00
diff --git a/.github/workflows/deploy-main.yml b/.github/workflows/deploy-main.yml
@@ -56,12 +56,19 @@ jobs:
           NODE_ENV: development
           VITE_TEST_SERVER_AUTH: "admin:opencast"
 
-
       - name: Prepare git
         run: |
           git config --global user.name "Release Bot"
           git config --global user.email "cloud@opencast.org"
 
+      - name: update CSS and other assets
+        if: github.ref == 'refs/heads/develop'
+        run: |
+          rm -rf assets
+          mv assets_temp assets
+          git add assets
+          git diff --staged --quiet || git commit --amend -m "Build $(date)"
+
       - name: Commit new version
         run: |
           git fetch --unshallow origin gh-pages
@@ -70,7 +77,7 @@ jobs:
           rm -rf $BRANCH
           mv build $BRANCH
           #Generate an index, in case anyone lands at the root of the test domain
-          echo '<html><head><link rel=stylesheet type=text/css href=.github/assets/index.css /></head><body><div class="head-container"><img src=https://admin-interface.opencast.org/develop/assets/opencast-white-B3KJ3o-a.svg /></div><div class="navbar-container"></div><div class="text-container"><p>Deployment for the latest development versions of the Opencast admininterface.The branches listed here correspond to Opencast's own branches.</br><b>Please select a version.</b></p></div><ul>' > index.html
+          echo '<html><head><link rel=stylesheet type=text/css href=assets/index.css /></head><body><div class="head-container"><img src=assets/opencast-white.svg /></div><div class="navbar-container"></div><div class="text-container"><p>Deployment for the latest development versions of the Opencast admin interface.The branches listed here correspond to Opencast\'s own branches.</br><b>Please select a version.</b></p></div><ul>' > index.html
           find . -mindepth 1 -maxdepth 1 -type d \
             | grep '[0-9]*.x\|develop' \
             | sort -r \
@@ -81,9 +88,6 @@ jobs:
         env:
           BRANCH: ${{needs.detect.outputs.branch}}
 
-      - name: update CSS and other assets
-        if: github.ref == 'refs/heads/develop'
-        run: cp -r .github/assets admin-interface-test/
 
       - name: Push updates
         run: git push origin gh-pages --force
diff --git a/.github/workflows/deploy-test.yml b/.github/workflows/deploy-test.yml
@@ -111,16 +111,12 @@ jobs:
       - name: generate index.html
         working-directory: admin-interface-test
         run: |
-          echo '<html><head><link rel=stylesheet type=text/css href=.github/assets/index.css /></head><body><div class="head-container"><img src=https://admin-interface.opencast.org/develop/assets/opencast-white-B3KJ3o-a.svg /></div><div class="navbar-container"></div><div class="text-container"><p>Test deployment for the latest development versions of the Opencast admininterface.The branches listed here correspond to Opencast's own branches.</br><b>Please select a version.</b></p></div><ul>' > index.html
+          echo '<html><body><ul>' > index.html
           find . -maxdepth 2 -name '*_*' -type d \
             | sort -r \
             | sed 's/^\(.*\)$/<li><a href=\1>\1<\/a><\/li>/' >> index.html
           echo '</ul></body></html>' >> index.html
 
-      - name: update CSS and other assets
-        if: github.ref == 'refs/heads/develop'
-        run: cp -r .github/assets admin-interface-test/
-
       - name: commit new version
         working-directory: admin-interface-test
         run: |
