Try fix linux Qt5 runner

pencil2d · Nov 29, 2024 · ad7cdbd · ad7cdbd
1 parent 685f96f
commit ad7cdbd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 12 deletions.
diff --git a/.github/actions/install-dependencies/install-dependencies.sh b/.github/actions/install-dependencies/install-dependencies.sh
@@ -28,6 +28,12 @@ setup_linux() {
       gstreamer1.0-plugins-good gstreamer1.0-plugins-bad \
       gstreamer1.0-plugins-ugly gstreamer1.0-alsa gstreamer1.0-pulseaudio git \
       curl libfuse2
+
+    curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.1/install.sh | bash
+          export NVM_DIR="$HOME/.nvm" 
+          [ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh"
+    nvm install 16.20.2
+    nvm use 16.20.2
   else
     apt-get install -yq --no-install-suggests --no-install-recommends \
       build-essential qt6-l10n-tools qt6-base-dev qt6-multimedia-dev \

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -77,23 +77,13 @@ jobs:
     container: ${{matrix.container}}
     env: {ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true}
     steps:
-    - name: Install git (Linux)
-      # GitHub runners come with git pre-installed, but our "custom" Linux
-      # container image does not
-      if: runner.os == 'Linux'
-      run: |
-        apt-get update -yq
-        apt-get -yq install software-properties-common
-        apt-add-repository -y ppa:git-core/ppa
-        apt-get update -yq
-        apt-get install -yq --no-install-suggests --no-install-recommends git
-    - name: Check out repository
-      uses: actions/checkout@v3
     - name: Install dependencies
       uses: ./.github/actions/install-dependencies
       with:
         arch: ${{matrix.arch}}
         qt: ${{matrix.qt}}
+    - name: Check out repository
+      uses: actions/checkout@v3
 
     - name: Set up environment
       uses: ./.github/actions/setup-environment