Fixing gitlab ci manifest path issue

OpenShot · May 28, 2024 · 191d2f8 · 191d2f8
1 parent 264568f
commit 191d2f8
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -107,9 +107,10 @@ windows-builder-x64:
     - $PREV_GIT_LABEL=(git describe --tags --abbrev=0 '@^')
     - git log "$PREV_GIT_LABEL..@" --oneline --pretty=format:"- %C(auto,yellow)%h%C(auto,magenta)% %C(auto,blue)%>(12,trunc)%ad %C(auto,green)%<(25,trunc)%aN%C(auto,reset)%s%C(auto,red)% gD% D" --date=short > "build/install-x64/share/$CI_PROJECT_NAME.log"
     - python3 -u freeze.py build --git-branch=$CI_COMMIT_REF_NAME
-    - python3 -u installer/build_server.py "$SLACK_TOKEN" "$WINDOWS_KEY" "$WINDOWS_PASSWORD" "$GITHUB_USER" "$GITHUB_PASS" "False" "$CI_COMMIT_REF_NAME" "$MAC_PASSWORD"
+    - $EXE_PATH = "$CI_PROJECT_DIR\build\exe.mingw-" + $PY_ABI + "\openshot-qt.exe"
     - (Get-Content $manifestPath) -replace "VERSION", $env:VERSION -replace "ARCHITECTURE", "x64" | Set-Content $manifestPath
-    - rcedit-x64.exe build/install-x64/bin/openshot-qt.exe --application-manifest installer/windows.manifest
+    - rcedit-x64.exe "$EXE_PATH" --application-manifest installer/windows.manifest
+    - python3 -u installer/build_server.py "$SLACK_TOKEN" "$WINDOWS_KEY" "$WINDOWS_PASSWORD" "$GITHUB_USER" "$GITHUB_PASS" "False" "$CI_COMMIT_REF_NAME" "$MAC_PASSWORD"
   when: always
   except:
   - tags
@@ -148,9 +149,9 @@ windows-builder-x86:
     - python3 -u freeze.py build --git-branch=$CI_COMMIT_REF_NAME
     - $EXE_PATH = "$CI_PROJECT_DIR\build\exe.mingw-" + $PY_ABI + "\openshot-qt.exe"
     - editbin /LARGEADDRESSAWARE "$EXE_PATH"
-    - python3 -u installer/build_server.py "$SLACK_TOKEN" "$WINDOWS_KEY" "$WINDOWS_PASSWORD" "$GITHUB_USER" "$GITHUB_PASS" "True" "$CI_COMMIT_REF_NAME" "$MAC_PASSWORD"
     - (Get-Content $manifestPath) -replace "VERSION", $env:VERSION -replace "ARCHITECTURE", "x86" | Set-Content $manifestPath
-    - rcedit-x64.exe build/install-x64/bin/openshot-qt.exe --application-manifest installer/windows.manifest
+    - rcedit-x86.exe "$EXE_PATH" --application-manifest installer/windows.manifest
+    - python3 -u installer/build_server.py "$SLACK_TOKEN" "$WINDOWS_KEY" "$WINDOWS_PASSWORD" "$GITHUB_USER" "$GITHUB_PASS" "True" "$CI_COMMIT_REF_NAME" "$MAC_PASSWORD"
   when: always
   except:
   - tags