Skip to content

Commit ba9df39

Browse files
committed
Fixing issues with upstream PR:
- Saving assets ahead of checkout of gh-pages - Updating assets after checkout, if appropriate (develop only) - Added missing logo
1 parent 7dfbbba commit ba9df39

2 files changed

Lines changed: 83 additions & 8 deletions

File tree

.github/assets/opencast-white.svg

Lines changed: 72 additions & 0 deletions
Loading

.github/workflows/deploy-main.yml

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -61,16 +61,11 @@ jobs:
6161
git config --global user.name "Release Bot"
6262
git config --global user.email "cloud@opencast.org"
6363
64-
- name: update CSS and other assets
65-
if: github.ref == 'refs/heads/develop'
66-
run: |
67-
rm -rf assets
68-
mv assets_temp assets
69-
git add assets
70-
git diff --staged --quiet || git commit --amend -m "Build $(date)"
71-
7264
- name: Commit new version
7365
run: |
66+
# Save the current assets from the main branch
67+
mv .github/assets assets_temp
68+
# Update and change to the gh-pages branch
7469
git fetch --unshallow origin gh-pages
7570
git checkout gh-pages
7671
# Update gh-pages
@@ -88,6 +83,14 @@ jobs:
8883
env:
8984
BRANCH: ${{needs.detect.outputs.branch}}
9085

86+
- name: update CSS and other assets
87+
if: github.ref == 'refs/heads/develop'
88+
run: |
89+
rm -rf assets
90+
mv assets_temp assets
91+
git add assets
92+
git diff --staged --quiet || git commit --amend -m "Build $(date)"
93+
9194
9295
- name: Push updates
9396
run: git push origin gh-pages --force

0 commit comments

Comments
 (0)