[ele]11.1 (#9820)

* [ele]venpointone * [ele] fix tier implementation * [ele] fix storm swell duplicate * [ele] implement asc dre bug behavior * [ele] only give short ele after asc * [ele] cleanup * [CI] re-enable CI for PTR, add Ele for PTR CI * [CI] fix indentation * [ele] use asc spell for EQ OL too
simulationcraft · Dec 27, 2024 · 56a0068 · 56a0068
1 parent aa09183
commit 56a0068
Show file tree

Hide file tree

Showing 2 changed files with 237 additions and 161 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -330,151 +330,133 @@ jobs:
           path: ${{ matrix.spec }}.simc
           retention-days: 1
 
-  # spec-test-ptr:
-  #   name: spec-test-ptr-${{ matrix.spec }}-${{ matrix.fightstyle }}
-  #   runs-on: ${{ matrix.os }}
-  #   needs: [ ubuntu-clang-build ]
-
-  #   strategy:
-  #     fail-fast: false
-  #     matrix:
-  #       cppVersion: [17]
-  #       compiler: [clang++-15]
-  #       spec: [
-  #         ]
-  #       fightstyle: [singletarget, multitarget, dungeonslice]
-  #       include:
-  #         - compiler: clang++-15
-  #           os: ubuntu-22.04
-  #         - fightstyle: multitarget
-  #           style_arg: desired_targets=10
-  #         - fightstyle: dungeonslice
-  #           style_arg: fight_style=DungeonSlice
-
-  #   env:
-  #     UBSAN_OPTIONS: print_stacktrace=1
-  #     SIMC_ARGS: output=/dev/null threads=2 iterations=10 cleanup_threads=1 ptr=1
-  #     PLAYER_ARGS: load_default_gear=1
-
-  #   steps:
-  #     - uses: actions/cache@v4
-  #       with:
-  #         path: |
-  #           ${{ runner.workspace }}/b/ninja/simc
-  #           profiles
-  #           tests
-  #           generate_profiles_ci.sh
-  #           .git
-  #         key: ubuntu-${{ matrix.compiler }}-for_run-${{ github.sha }}-cpp-${{ matrix.cppVersion }}
-
-  #     - name: Setup
-  #       id: setup
-  #       env:
-  #         MATRIX_SPEC: ${{ matrix.spec }}
-  #       run: |
-  #         echo "CLASS_STR=${MATRIX_SPEC%%_*}" >> "$GITHUB_ENV"
-  #         echo "SPEC_STR=${MATRIX_SPEC#*_}" >> "$GITHUB_ENV"
-
-
-  #     - name: "Log Debug"
-  #       if: always()
-  #       run: |
-  #         ${{ runner.workspace }}/b/ninja/simc ${{ env.SIMC_ARGS }} log=1 debug=1 ${{ matrix.style_arg }}\
-  #           enable_all_talents=1 enable_all_item_effects=1 enable_all_sets=1 \
-  #           ${{ env.CLASS_STR }}=${{ matrix.spec }} spec=${{ env.SPEC_STR }} ${{ env.PLAYER_ARGS }}
-  #         ${{ runner.workspace }}/b/ninja/simc ${{ env.SIMC_ARGS }} log=1 debug=1 ${{ matrix.style_arg }}\
-  #           ${{ env.CLASS_STR }}=${{ matrix.spec }} spec=${{ env.SPEC_STR }} ${{ env.PLAYER_ARGS }}
-
-  #     - name: "HTML JSON"
-  #       if: always()
-  #       run: |
-  #         ${{ runner.workspace }}/b/ninja/simc ${{ env.SIMC_ARGS }} html=test.html json=test.json ${{ matrix.style_arg }}\
-  #           enable_all_talents=1 enable_all_item_effects=1 enable_all_sets=1 \
-  #           ${{ env.CLASS_STR }}=${{ matrix.spec }} spec=${{ env.SPEC_STR }} ${{ env.PLAYER_ARGS }}
-  #         ${{ runner.workspace }}/b/ninja/simc ${{ env.SIMC_ARGS }} html=test.html json=test.json ${{ matrix.style_arg }}\
-  #           ${{ env.CLASS_STR }}=${{ matrix.spec }} spec=${{ env.SPEC_STR }} ${{ env.PLAYER_ARGS }}
-
-  #     - name: "No Talents, No Effects, No Sets"
-  #       if: always()
-  #       run: |
-  #         ${{ runner.workspace }}/b/ninja/simc ${{ env.SIMC_ARGS }} ${{ matrix.style_arg }}\
-  #           ${{ env.CLASS_STR }}=${{ matrix.spec }} spec=${{ env.SPEC_STR }} ${{ env.PLAYER_ARGS }}
-
-  #     - name: "No Talents, No Effects, All Sets"
-  #       if: always()
-  #       run: |
-  #         ${{ runner.workspace }}/b/ninja/simc ${{ env.SIMC_ARGS }} ${{ matrix.style_arg }}\
-  #           enable_all_sets=1 \
-  #           ${{ env.CLASS_STR }}=${{ matrix.spec }} spec=${{ env.SPEC_STR }} ${{ env.PLAYER_ARGS }}
-
-  #     - name: "No Talents, All Effects, No Sets"
-  #       if: always()
-  #       run: |
-  #         ${{ runner.workspace }}/b/ninja/simc ${{ env.SIMC_ARGS }} ${{ matrix.style_arg }}\
-  #           enable_all_item_effects=1 \
-  #           ${{ env.CLASS_STR }}=${{ matrix.spec }} spec=${{ env.SPEC_STR }} ${{ env.PLAYER_ARGS }}
-
-  #     - name: "No Talents, All Effects, All Sets"
-  #       if: always()
-  #       run: |
-  #         ${{ runner.workspace }}/b/ninja/simc ${{ env.SIMC_ARGS }} ${{ matrix.style_arg }}\
-  #           enable_all_item_effects=1 enable_all_sets=1 \
-  #           ${{ env.CLASS_STR }}=${{ matrix.spec }} spec=${{ env.SPEC_STR }} ${{ env.PLAYER_ARGS }}
-
-  #     - name: "Starter Talents, No Effects, No Sets"
-  #       if: always()
-  #       run: |
-  #         ${{ runner.workspace }}/b/ninja/simc ${{ env.SIMC_ARGS }} ${{ matrix.style_arg }}\
-  #           ${{ env.CLASS_STR }}=${{ matrix.spec }} spec=${{ env.SPEC_STR }} ${{ env.PLAYER_ARGS }} load_default_talents=1
-
-  #     - name: "Starter Talents, No Effects, All Sets"
-  #       if: always()
-  #       run: |
-  #         ${{ runner.workspace }}/b/ninja/simc ${{ env.SIMC_ARGS }} ${{ matrix.style_arg }}\
-  #           enable_all_sets=1 \
-  #           ${{ env.CLASS_STR }}=${{ matrix.spec }} spec=${{ env.SPEC_STR }} ${{ env.PLAYER_ARGS }} load_default_talents=1
-
-  #     - name: "Starter Talents, All Effects, No Sets"
-  #       if: always()
-  #       run: |
-  #         ${{ runner.workspace }}/b/ninja/simc ${{ env.SIMC_ARGS }} ${{ matrix.style_arg }}\
-  #           enable_all_item_effects=1 \
-  #           ${{ env.CLASS_STR }}=${{ matrix.spec }} spec=${{ env.SPEC_STR }} ${{ env.PLAYER_ARGS }} load_default_talents=1
-
-  #     - name: "Starter Talents, All Effects, All Sets"
-  #       if: always()
-  #       run: |
-  #         ${{ runner.workspace }}/b/ninja/simc ${{ env.SIMC_ARGS }} ${{ matrix.style_arg }}\
-  #           enable_all_item_effects=1 enable_all_sets=1 \
-  #           ${{ env.CLASS_STR }}=${{ matrix.spec }} spec=${{ env.SPEC_STR }} ${{ env.PLAYER_ARGS }} load_default_talents=1
-
-  #     - name: "All Talents, No Effects, No Sets"
-  #       if: always()
-  #       run: |
-  #         ${{ runner.workspace }}/b/ninja/simc ${{ env.SIMC_ARGS }} ${{ matrix.style_arg }}\
-  #           enable_all_talents=1 \
-  #           ${{ env.CLASS_STR }}=${{ matrix.spec }} spec=${{ env.SPEC_STR }} ${{ env.PLAYER_ARGS }}
-
-  #     - name: "All Talents, No Effects, All Sets"
-  #       if: always()
-  #       run: |
-  #         ${{ runner.workspace }}/b/ninja/simc ${{ env.SIMC_ARGS }} ${{ matrix.style_arg }}\
-  #           enable_all_talents=1 enable_all_sets=1 \
-  #           ${{ env.CLASS_STR }}=${{ matrix.spec }} spec=${{ env.SPEC_STR }} ${{ env.PLAYER_ARGS }}
-
-  #     - name: "All Talents, All Effects, No Sets"
-  #       if: always()
-  #       run: |
-  #         ${{ runner.workspace }}/b/ninja/simc ${{ env.SIMC_ARGS }} ${{ matrix.style_arg }}\
-  #           enable_all_talents=1 enable_all_item_effects=1 \
-  #           ${{ env.CLASS_STR }}=${{ matrix.spec }} spec=${{ env.SPEC_STR }} ${{ env.PLAYER_ARGS }}
-
-  #     - name: "All Talents, All Effects, All Sets"
-  #       if: always()
-  #       run: |
-  #         ${{ runner.workspace }}/b/ninja/simc ${{ env.SIMC_ARGS }} ${{ matrix.style_arg }}\
-  #           enable_all_talents=1 enable_all_item_effects=1 enable_all_sets=1 \
-  #           ${{ env.CLASS_STR }}=${{ matrix.spec }} spec=${{ env.SPEC_STR }} ${{ env.PLAYER_ARGS }}
+  spec-test-ptr:
+    name: spec-test-ptr-${{ matrix.spec }}-${{ matrix.fightstyle }}
+    runs-on: ${{ matrix.os }}
+    needs: [ ubuntu-clang-build ]
+    strategy:
+      fail-fast: false
+      matrix:
+        cppVersion: [17]
+        compiler: [clang++-15]
+        spec: [
+           shaman_elemental
+          ]
+        fightstyle: [singletarget, multitarget, dungeonslice]
+        include:
+          - compiler: clang++-15
+            os: ubuntu-22.04
+          - fightstyle: multitarget
+            style_arg: desired_targets=10
+          - fightstyle: dungeonslice
+            style_arg: fight_style=DungeonSlice
+    env:
+      UBSAN_OPTIONS: print_stacktrace=1
+      SIMC_ARGS: output=/dev/null threads=2 iterations=10 cleanup_threads=1 ptr=1
+      PLAYER_ARGS: load_default_gear=1
+    steps:
+      - uses: actions/cache@v4
+        with:
+          path: |
+            ${{ runner.workspace }}/b/ninja/simc
+            profiles
+            tests
+            generate_profiles_ci.sh
+            .git
+          key: ubuntu-${{ matrix.compiler }}-for_run-${{ github.sha }}-cpp-${{ matrix.cppVersion }}
+      - name: Setup
+        id: setup
+        env:
+          MATRIX_SPEC: ${{ matrix.spec }}
+        run: |
+          echo "CLASS_STR=${MATRIX_SPEC%%_*}" >> "$GITHUB_ENV"
+          echo "SPEC_STR=${MATRIX_SPEC#*_}" >> "$GITHUB_ENV"
+      - name: "Log Debug"
+        if: always()
+        run: |
+          ${{ runner.workspace }}/b/ninja/simc ${{ env.SIMC_ARGS }} log=1 debug=1 ${{ matrix.style_arg }}\
+            enable_all_talents=1 enable_all_item_effects=1 enable_all_sets=1 \
+            ${{ env.CLASS_STR }}=${{ matrix.spec }} spec=${{ env.SPEC_STR }} ${{ env.PLAYER_ARGS }}
+          ${{ runner.workspace }}/b/ninja/simc ${{ env.SIMC_ARGS }} log=1 debug=1 ${{ matrix.style_arg }}\
+            ${{ env.CLASS_STR }}=${{ matrix.spec }} spec=${{ env.SPEC_STR }} ${{ env.PLAYER_ARGS }}
+      - name: "HTML JSON"
+        if: always()
+        run: |
+          ${{ runner.workspace }}/b/ninja/simc ${{ env.SIMC_ARGS }} html=test.html json=test.json ${{ matrix.style_arg }}\
+            enable_all_talents=1 enable_all_item_effects=1 enable_all_sets=1 \
+            ${{ env.CLASS_STR }}=${{ matrix.spec }} spec=${{ env.SPEC_STR }} ${{ env.PLAYER_ARGS }}
+          ${{ runner.workspace }}/b/ninja/simc ${{ env.SIMC_ARGS }} html=test.html json=test.json ${{ matrix.style_arg }}\
+            ${{ env.CLASS_STR }}=${{ matrix.spec }} spec=${{ env.SPEC_STR }} ${{ env.PLAYER_ARGS }}
+      - name: "No Talents, No Effects, No Sets"
+        if: always()
+        run: |
+          ${{ runner.workspace }}/b/ninja/simc ${{ env.SIMC_ARGS }} ${{ matrix.style_arg }}\
+            ${{ env.CLASS_STR }}=${{ matrix.spec }} spec=${{ env.SPEC_STR }} ${{ env.PLAYER_ARGS }}
+      - name: "No Talents, No Effects, All Sets"
+        if: always()
+        run: |
+          ${{ runner.workspace }}/b/ninja/simc ${{ env.SIMC_ARGS }} ${{ matrix.style_arg }}\
+            enable_all_sets=1 \
+            ${{ env.CLASS_STR }}=${{ matrix.spec }} spec=${{ env.SPEC_STR }} ${{ env.PLAYER_ARGS }}
+      - name: "No Talents, All Effects, No Sets"
+        if: always()
+        run: |
+          ${{ runner.workspace }}/b/ninja/simc ${{ env.SIMC_ARGS }} ${{ matrix.style_arg }}\
+            enable_all_item_effects=1 \
+            ${{ env.CLASS_STR }}=${{ matrix.spec }} spec=${{ env.SPEC_STR }} ${{ env.PLAYER_ARGS }}
+      - name: "No Talents, All Effects, All Sets"
+        if: always()
+        run: |
+          ${{ runner.workspace }}/b/ninja/simc ${{ env.SIMC_ARGS }} ${{ matrix.style_arg }}\
+            enable_all_item_effects=1 enable_all_sets=1 \
+            ${{ env.CLASS_STR }}=${{ matrix.spec }} spec=${{ env.SPEC_STR }} ${{ env.PLAYER_ARGS }}
+      - name: "Starter Talents, No Effects, No Sets"
+        if: always()
+        run: |
+          ${{ runner.workspace }}/b/ninja/simc ${{ env.SIMC_ARGS }} ${{ matrix.style_arg }}\
+            ${{ env.CLASS_STR }}=${{ matrix.spec }} spec=${{ env.SPEC_STR }} ${{ env.PLAYER_ARGS }} load_default_talents=1
+      - name: "Starter Talents, No Effects, All Sets"
+        if: always()
+        run: |
+          ${{ runner.workspace }}/b/ninja/simc ${{ env.SIMC_ARGS }} ${{ matrix.style_arg }}\
+            enable_all_sets=1 \
+            ${{ env.CLASS_STR }}=${{ matrix.spec }} spec=${{ env.SPEC_STR }} ${{ env.PLAYER_ARGS }} load_default_talents=1
+      - name: "Starter Talents, All Effects, No Sets"
+        if: always()
+        run: |
+          ${{ runner.workspace }}/b/ninja/simc ${{ env.SIMC_ARGS }} ${{ matrix.style_arg }}\
+            enable_all_item_effects=1 \
+            ${{ env.CLASS_STR }}=${{ matrix.spec }} spec=${{ env.SPEC_STR }} ${{ env.PLAYER_ARGS }} load_default_talents=1
+      - name: "Starter Talents, All Effects, All Sets"
+        if: always()
+        run: |
+          ${{ runner.workspace }}/b/ninja/simc ${{ env.SIMC_ARGS }} ${{ matrix.style_arg }}\
+            enable_all_item_effects=1 enable_all_sets=1 \
+            ${{ env.CLASS_STR }}=${{ matrix.spec }} spec=${{ env.SPEC_STR }} ${{ env.PLAYER_ARGS }} load_default_talents=1
+      - name: "All Talents, No Effects, No Sets"
+        if: always()
+        run: |
+          ${{ runner.workspace }}/b/ninja/simc ${{ env.SIMC_ARGS }} ${{ matrix.style_arg }}\
+            enable_all_talents=1 \
+            ${{ env.CLASS_STR }}=${{ matrix.spec }} spec=${{ env.SPEC_STR }} ${{ env.PLAYER_ARGS }}
+      - name: "All Talents, No Effects, All Sets"
+        if: always()
+        run: |
+          ${{ runner.workspace }}/b/ninja/simc ${{ env.SIMC_ARGS }} ${{ matrix.style_arg }}\
+            enable_all_talents=1 enable_all_sets=1 \
+            ${{ env.CLASS_STR }}=${{ matrix.spec }} spec=${{ env.SPEC_STR }} ${{ env.PLAYER_ARGS }}
+      - name: "All Talents, All Effects, No Sets"
+        if: always()
+        run: |
+          ${{ runner.workspace }}/b/ninja/simc ${{ env.SIMC_ARGS }} ${{ matrix.style_arg }}\
+            enable_all_talents=1 enable_all_item_effects=1 \
+            ${{ env.CLASS_STR }}=${{ matrix.spec }} spec=${{ env.SPEC_STR }} ${{ env.PLAYER_ARGS }}
+      - name: "All Talents, All Effects, All Sets"
+        if: always()
+        run: |
+          ${{ runner.workspace }}/b/ninja/simc ${{ env.SIMC_ARGS }} ${{ matrix.style_arg }}\
+            enable_all_talents=1 enable_all_item_effects=1 enable_all_sets=1 \
+            ${{ env.CLASS_STR }}=${{ matrix.spec }} spec=${{ env.SPEC_STR }} ${{ env.PLAYER_ARGS }}
 
   apl-profile:
     name: Action Priority List Dump / Regenerate Profiles