CodeQL: Attempt to fix build steps

Copied from the ubuntu-latest workflow.
jack416 · Jul 15, 2020 · fc6a005 · fc6a005
1 parent 21c6034
commit fc6a005
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 21 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -34,21 +34,18 @@ jobs:
       # with:
       #   languages: go, javascript, csharp, python, cpp, java
 
-    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-    # If this step fails, then you should remove it and run the build manually (see below)
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
-
-    # ℹ️ Command-line programs to run using the OS shell.
-    # 📚 https://git.io/JvXDl
-
-    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
-    #    and modify them (or add more) to build your code if your project
-    #    uses a compiled language
-
-    #- run: |
-    #   make bootstrap
-    #   make release
+    - name: Install dependencies
+      run: |
+        sudo apt update
+        sudo apt install qt5-default libqt5svg5-dev qttools5-dev-tools zlib1g-dev qtdeclarative5-dev qtdeclarative5-private-dev qbs python3-dev
+
+    - name: Setup qbs
+      run: |
+        qbs setup-toolchains --detect
+        qbs setup-qt --detect
+
+    - name: Build
+      run: qbs build profile:qt-5-9-5
 
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v1
diff --git a/.github/workflows/macos-latest.yml b/.github/workflows/macos-latest.yml
@@ -8,28 +8,35 @@ jobs:
     runs-on: macOS-latest
 
     steps:
-    - uses: actions/checkout@v1
+    - name: Checkout repository
+      uses: actions/checkout@v1
+
     - name: Install dependencies
       run: |
         brew update
         brew install qbs
         brew link qt5 --force
+
     - name: Setup Qbs
       run: |
         qbs setup-toolchains --detect
         qbs config defaultProfile xcode
+
     - name: Build
       run: |
         export TILED_VERSION=$(git describe | cut -c 2-)
         qbs build config:release qbs.installPrefix:"" projects.Tiled.version:$TILED_VERSION
+
     - name: Package
       run: |
         qbs install --install-root install config:release
         macdeployqt install/Tiled.app -verbose=2
         pushd install
         ruby ../dist/macos/fixup-install-names.rb
         popd
-    - uses: actions/upload-artifact@v1
+
+    - name: Upload artifact
+      uses: actions/upload-artifact@v1
       with:
         name: Tiled.app
         path: install/Tiled.app
diff --git a/.github/workflows/ubuntu-latest.yml b/.github/workflows/ubuntu-latest.yml
@@ -8,14 +8,18 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v1
-    - name: install dependencies
+    - name: Checkout repository
+      uses: actions/checkout@v1
+
+    - name: Install dependencies
       run: |
         sudo apt update
         sudo apt install qt5-default libqt5svg5-dev qttools5-dev-tools zlib1g-dev qtdeclarative5-dev qtdeclarative5-private-dev qbs python3-dev
-    - name: setup qbs
+
+    - name: Setup qbs
       run: |
         qbs setup-toolchains --detect
         qbs setup-qt --detect
-    - name: build
+
+    - name: Build
       run: qbs build profile:qt-5-9-5