Merge pull request #882 from utilForever/update-ci

Update GitHub Actions Images
utilForever · Apr 17, 2023 · 175da47 · 175da47
2 parents 9f26ee3 + ed90a2f
commit 175da47
Show file tree

Hide file tree

Showing 8 changed files with 82 additions and 81 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -3,7 +3,7 @@
 #
 # You may wish to alter this file to override the set of languages analyzed,
 # or to provide custom queries or build logic.
-name: "CodeQL"
+name: Code Scan
 
 on:
   push:
@@ -16,8 +16,8 @@ on:
 
 jobs:
   analyze:
-    name: Analyze
     runs-on: ubuntu-latest
+    name: 🔍 Scan - CodeQL
 
     strategy:
       fail-fast: false
@@ -50,7 +50,7 @@ jobs:
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
-        # By default, queries listed here will override any specified in a config file. 
+        # By default, queries listed here will override any specified in a config file.
         # Prefix the list here with "+" to use these queries and those in the config file.
         # queries: ./path/to/local/query, your-org/your-repo/queries@main
 

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -11,49 +11,39 @@ jobs:
     strategy:
       matrix:
         include:
-          # macOS 12.4 + Xcode 13.4.1
-          # - name: "macOS 12.4 + Xcode 13.4.1"
-          #   os: macos-12
-          #   compiler: xcode
-          #   version: "13.4.1"
-          # macOS 11.6 + Xcode 13.2.1
-          - name: "macOS 11.6 + Xcode 13.2.1"
-            os: macos-11
+          # macOS 12.6.5 + Xcode 14.2
+          - name: "macOS 12.6.5 + Xcode 14.2"
+            os: macos-12
             compiler: xcode
-            version: "13.2.1"
-          # macOS 11.6 + Xcode 12.5.1
-          - name: "macOS 11.6 + Xcode 12.5.1"
-            os: macos-11
+            version: "14.2"
+          # macOS 12.6.5 + Xcode 13.4.1
+          - name: "macOS 12.6.5 + Xcode 13.4.1"
+            os: macos-12
             compiler: xcode
-            version: "12.5.1"
-          # macOS 11.6 + Xcode 11.7
-          - name: "macOS 11.6 + Xcode 11.7"
+            version: "13.4.1"
+          # macOS 11.7.6 + Xcode 12.5.1
+          - name: "macOS 11.7.6 + Xcode 12.5.1"
             os: macos-11
             compiler: xcode
-            version: "11.7"
-          # macOS 12.4 + gcc-11
-          # - name: "macOS 12.4 + gcc-11"
-          #   os: macos-12
-          #   compiler: gcc
-          #   version: "11"
-          # macOS 11.6 + gcc-11
-          - name: "macOS 11.6 + gcc-11"
-            os: macos-11
+            version: "12.5.1"
+          # macOS 12.6.5 + gcc-12
+          - name: "macOS 12.6.5 + gcc-12"
+            os: macos-12
+            compiler: gcc
+            version: "12"
+          # macOS 12.6.5 + gcc-11
+          - name: "macOS 12.6.5 + gcc-11"
+            os: macos-12
             compiler: gcc
             version: "11"
-          # macOS 11.6 + gcc-10
-          - name: "macOS 11.6 + gcc-10"
+          # macOS 11.7.6 + gcc-10
+          - name: "macOS 11.7.6 + gcc-10"
             os: macos-11
             compiler: gcc
             version: "10"
-          # macOS 11.6 + gcc-9
-          - name: "macOS 11.6 + gcc-9"
-            os: macos-11
-            compiler: gcc
-            version: "9"
 
     runs-on: ${{ matrix.os }}
-    name: ${{ matrix.name }}
+    name: 🍎 Build - ${{ matrix.name }}
 
     steps:
     - uses: actions/checkout@v1
@@ -78,6 +68,6 @@ jobs:
       run: /Users/runner/work/RosettaStone/RosettaStone/build/bin/UnitTests
     - name: Run Python Test
       run: |
-        pip install -r requirements.txt
-        pip install .
-        python -m pytest Tests/PythonTests/
+        pip3 install -r requirements.txt
+        pip3 install .
+        python3 -m pytest Tests/PythonTests/
diff --git a/.github/workflows/semgrep.yml b/.github/workflows/semgrep.yml
@@ -1,23 +1,24 @@
-name: Semgrep
+name: Code Scan
+
 on:
-  pull_request: {}
-  push:
-    branches:
-      - main
-      - master
+  pull_request:
+    branches: [ main ]
     paths:
       - .github/workflows/semgrep.yml
   schedule:
     - cron: '0 0 * * 0'
+
 jobs:
   semgrep:
-    name: Scan
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
+    name: 🔎 Scan - Semgrep
+
     env:
       SEMGREP_APP_TOKEN: ${{ secrets.SEMGREP_APP_TOKEN }}
     container:
       image: returntocorp/semgrep
     if: (github.actor != 'dependabot[bot]')
+
     steps:
       - uses: actions/checkout@v3
       - run: semgrep ci
diff --git a/.github/workflows/ubuntu-codecov.yml b/.github/workflows/ubuntu-codecov.yml
@@ -1,4 +1,4 @@
-name: Ubuntu - Codecov
+name: Code Coverage
 
 on:
   push:
@@ -11,14 +11,14 @@ jobs:
     strategy:
       matrix:
         include:
-          # Ubuntu 20.04 + gcc-9
-          - name: "Ubuntu 20.04 + gcc-9"
-            os: ubuntu-20.04
+          # Ubuntu 22.04 + gcc-12
+          - name: "Ubuntu 22.04 + gcc-12"
+            os: ubuntu-22.04
             compiler: gcc
-            version: "9"
+            version: "12"
 
     runs-on: ${{ matrix.os }}
-    name: ${{ matrix.name }}
+    name: 🧪 Code Coverage - Codecov
 
     steps:
     - uses: actions/checkout@v1

diff --git a/.github/workflows/ubuntu-sonarcloud.yml b/.github/workflows/ubuntu-sonarcloud.yml
@@ -1,4 +1,4 @@
-name: Ubuntu - SonarCloud
+name: Static Analysis
 
 on:
   push:
@@ -9,24 +9,24 @@ on:
 jobs:
   build-ubuntu:
     runs-on: ${{ matrix.os }}
-    name: ${{ matrix.name }}
+    name: 🌞 Static Analysis - SonarCloud
     strategy:
       matrix:
         include:
-          # Ubuntu 20.04 + gcc-9
-          - name: "Ubuntu 20.04 + gcc-9"
+          # Ubuntu 20.04 + gcc-10
+          - name: "Ubuntu 20.04 + gcc-10"
             os: ubuntu-20.04
             compiler: gcc
-            version: "9"
+            version: "10"
     steps:
     - uses: actions/checkout@v2
       with:
         submodules: true
     - name: Prepare Sonar scanner
       run: |
-        wget -nv https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-4.6.0.2311-linux.zip
-        unzip -q sonar-scanner-cli-4.6.0.2311-linux.zip
-        echo "${PWD}/sonar-scanner-4.6.0.2311-linux/bin/" >> $GITHUB_PATH
+        wget -nv https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-4.7.0.2747-linux.zip
+        unzip -q sonar-scanner-cli-4.7.0.2747-linux.zip
+        echo "${PWD}/sonar-scanner-4.7.0.2747-linux/bin/" >> $GITHUB_PATH
         wget -nv https://sonarcloud.io/static/cpp/build-wrapper-linux-x86.zip
         unzip -q build-wrapper-linux-x86.zip
         echo "${PWD}/build-wrapper-linux-x86" >> $GITHUB_PATH

diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
@@ -11,29 +11,39 @@ jobs:
     strategy:
       matrix:
         include:
-          # Ubuntu 18.04 + gcc-9
-          - name: "Ubuntu 18.04 + gcc-9"
-            os: ubuntu-18.04
+          # Ubuntu 22.04 + gcc-12
+          - name: "Ubuntu 22.04 + gcc-12"
+            os: ubuntu-22.04
             compiler: gcc
-            version: "9"
-          # Ubuntu 20.04 + gcc-10
-          - name: "Ubuntu 20.04 + gcc-10"
-            os: ubuntu-20.04
+            version: "12"
+          # Ubuntu 22.04 + gcc-11
+          - name: "Ubuntu 22.04 + gcc-11"
+            os: ubuntu-22.04
+            compiler: gcc
+            version: "11"
+          # Ubuntu 22.04 + gcc-10
+          - name: "Ubuntu 22.04 + gcc-10"
+            os: ubuntu-22.04
             compiler: gcc
             version: "10"
-          # Ubuntu 18.04 + clang-9
-          - name: "Ubuntu 18.04 + clang-9"
-            os: ubuntu-18.04
+          # Ubuntu 22.04 + clang-14
+          - name: "Ubuntu 22.04 + clang-14"
+            os: ubuntu-22.04
             compiler: clang
-            version: "9"
-          # Ubuntu 20.04 + clang-10
-          - name: "Ubuntu 20.04 + clang-10"
-            os: ubuntu-20.04
+            version: "14"
+          # Ubuntu 22.04 + clang-14
+          - name: "Ubuntu 22.04 + clang-13"
+            os: ubuntu-22.04
             compiler: clang
-            version: "10"
+            version: "13"
+          # Ubuntu 22.04 + clang-12
+          - name: "Ubuntu 22.04 + clang-12"
+            os: ubuntu-22.04
+            compiler: clang
+            version: "12"
 
     runs-on: ${{ matrix.os }}
-    name: ${{ matrix.name }}
+    name: 🐧 Build - ${{ matrix.name }}
 
     steps:
     - uses: actions/checkout@v1

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -11,15 +11,15 @@ jobs:
     strategy:
       matrix:
         include:
-          # Windows Server 2019 + Visual Studio 2019
-          - name: "Windows Server 2019 + Visual Studio 2019"
-            os: windows-2019
           # Windows Server 2022 + Visual Studio 2022
           - name: "Windows Server 2022 + Visual Studio 2022"
             os: windows-2022
+          # Windows Server 2019 + Visual Studio 2019
+          - name: "Windows Server 2019 + Visual Studio 2019"
+            os: windows-2019
 
     runs-on: ${{ matrix.os }}
-    name: ${{ matrix.name }}
+    name: 🪟 Build - ${{ matrix.name }}
 
     steps:
     - uses: actions/checkout@v1

diff --git a/Includes/Rosetta/PlayMode/Tasks/ComplexTask.hpp b/Includes/Rosetta/PlayMode/Tasks/ComplexTask.hpp
@@ -305,7 +305,7 @@ class ComplexTask
     //! \param tasks A list of task of secret card.
     static TaskList ActivateSecret(TaskList tasks)
     {
-        TaskList ret{ std::move(tasks) };
+        TaskList ret{ tasks };
         ret.emplace_back(std::make_shared<SimpleTasks::SetGameTagTask>(
             EntityType::SOURCE, GameTag::REVEALED, 1));
         ret.emplace_back(std::make_shared<SimpleTasks::MoveToGraveyardTask>(