Merge remote-tracking branch 'upstream/main' into replace-iarna-with-…

…smol
opencast · Sep 2, 2024 · 544c120 · 544c120
2 parents b9ef5fb + 6b8eabd
commit 544c120
Show file tree

Hide file tree

Showing 7 changed files with 2,751 additions and 8,867 deletions.
diff --git a/.github/build-release.sh b/.github/build-release.sh
@@ -6,7 +6,7 @@ export PUBLIC_URL=/editor-ui
 export VITE_APP_SETTINGS_PATH="/ui/config/editor/editor-settings.toml"
 npm run build
 
-FILENAME="oc-editor-$(date --utc +%F).tar.gz"
+FILENAME="oc-editor-$(date -u +%F).tar.gz"
 cd build
 TMP="$(mktemp)"
 mv editor-settings.toml "$TMP"

diff --git a/.github/workflows/update-test.yml b/.github/workflows/update-test.yml
@@ -52,7 +52,7 @@ jobs:
         ssh-keyscan github.com >> ~/.ssh/known_hosts
 
     - name: Wait for previous workflows to finish
-      uses: softprops/turnstyle@v1
+      uses: softprops/turnstyle@v2
       with:
         same-branch-only: false
       env: