[Android] Improve the remote access script arguments

Nicolas Pomepuy git at videolan.org
Wed May 22 11:47:53 UTC 2024


vlc-android | branch: refs/tags/3.6.0-test-remoteaccess | Nicolas Pomepuy <nicolas at videolabs.io> | Wed May 22 13:35:58 2024 +0200| [b20f1bae924f7b779534e67c0d30f8072ca6cbb9] | committer: Nicolas Pomepuy

Improve the remote access script arguments

> https://code.videolan.org/videolan/vlc-android/commit/b20f1bae924f7b779534e67c0d30f8072ca6cbb9
---

 buildsystem/compile-remoteaccess.sh | 6 +++---
 buildsystem/gitlab/.gitlab-ci.yml   | 3 +--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/buildsystem/compile-remoteaccess.sh b/buildsystem/compile-remoteaccess.sh
index b88e9fe73a..75e8127353 100755
--- a/buildsystem/compile-remoteaccess.sh
+++ b/buildsystem/compile-remoteaccess.sh
@@ -40,8 +40,8 @@ while [ $# -gt 0 ]; do
             echo "Use -c to build the remote access project"
             exit 0
             ;;
-        -c)
-            BUILD_REMOTE_ACCCESS=1
+        --init)
+            INIT_ONLY=1
             ;;
         *)
             diagnostic "$0: Invalid option '$1'."
@@ -78,7 +78,7 @@ done
       cd ..
   fi
 
-  if [ "$BUILD_REMOTE_ACCCESS" = 1 ]; then
+  if [ "$INIT_ONLY" != 1 ]; then
         diagnostic "Building the Remote Access project"
     cd "$VLC_REMOTE_ACCESS_PATH"
 
diff --git a/buildsystem/gitlab/.gitlab-ci.yml b/buildsystem/gitlab/.gitlab-ci.yml
index 3a9bf32700..66d8587df3 100644
--- a/buildsystem/gitlab/.gitlab-ci.yml
+++ b/buildsystem/gitlab/.gitlab-ci.yml
@@ -46,7 +46,7 @@ webserver-install-dependencies:
     extends: .webserver-base
     stage: webserver-install-dependencies
     script:
-      - ./buildsystem/compile-remoteaccess.sh
+      - ./buildsystem/compile-remoteaccess.sh --init
       - cd "$WEBSERVER_DIR"
       - npm install
     artifacts:
@@ -75,7 +75,6 @@ webserver-vulnerabilities:
     needs:
       - job: "webserver-install-dependencies"
     script:
-        - ./buildsystem/compile-remoteaccess.sh
         - cd "$WEBSERVER_DIR"
         - npx audit-ci@^6 --config ./audit-ci.jsonc
 



More information about the Android mailing list