Merge branch 'feature/toc-bump' into release/v0.5

.github/workflows/build.yml

@@ -14,23 +14,16 @@ jobs:
 
     - uses: actions/checkout@v1
 
-    - name: Set env with Curse Forge API key
-      shell: bash
-      run: sudo echo "::set-env name=CF_API_KEY::${{ secrets.CF_API_KEY }}"
-
-    - name: Store Curse Forge API key into a .env file
-      shell: bash
-      run: sudo echo "CF_API_KEY=${CF_API_KEY}" > ./.env && ls -al
-      working-directory: ./.release
-
-    - name: Build Retail
-      run: sudo bash ./release.sh -l
-      shell: bash
-      working-directory: ./.release
-
-    - name: Build Classic
-      run: sudo bash ./release.sh -l -g 1.13.3
-      shell: bash
-      working-directory: ./.release
-
+    - uses: BigWigsMods/packager@master
+      name: Build Retail and upload to CurseForge
+      with:
+        args: -l -g retail
+
+    - uses: BigWigsMods/packager@master
+      name: Build Classic and upload to CurseForge
+      with:
+        args: -l -g classic
+
+    env:
+      CF_API_KEY: ${{ secrets.CF_API_KEY }}
 

.github/workflows/feature-branch-build.yaml

@@ -0,0 +1,96 @@
+name: Feature-branch-build
+
+on:
+  push:
+    branches:
+      - 'feature/**'
+#        branches-ignore:
+#            - 'main'
+#            - 'master'
+#            - 'releases/**'
+#            - 'release/**'
+
+jobs:
+  build-classic:
+
+    runs-on: ubuntu-latest
+
+    steps:
+      #- name: Dump GitHub context
+      #  env:
+      #    GITHUB_CONTEXT: ${{ toJSON(github) }}
+      #  run: echo "$GITHUB_CONTEXT"
+
+      - uses: actions/checkout@v1
+
+      - uses: BigWigsMods/packager@master
+        name: Build Classic
+        with:
+          args: -r ./zip -z -d -g classic
+
+      - name: Name artifact with git hash
+        run: echo 'ARTIFACT_NAME=Classic-${{ github.event.repository.name }}-'$(git -C ./zip show --no-patch --format="%H") >> $GITHUB_ENV
+
+      - name: Store built zip
+        uses: actions/upload-artifact@v2
+        with:
+          name : ${{ env.ARTIFACT_NAME }}
+          path: ./zip/
+
+
+    env:
+      CF_API_KEY: ${{ secrets.CF_API_KEY }}
+
+  deploy-classic:
+    needs: build-classic
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+
+      - name: Get artifact
+        uses: actions/download-artifact@v2
+        with:
+          name: ${{ env.ARTIFACT_NAME }}
+          path: ./zip/
+
+  build-retail:
+
+    runs-on: ubuntu-latest
+
+    steps:
+      #- name: Dump GitHub context
+      #  env:
+      #    GITHUB_CONTEXT: ${{ toJSON(github) }}
+      #  run: echo "$GITHUB_CONTEXT"
+
+      - uses: actions/checkout@v1
+
+      - uses: BigWigsMods/packager@master
+        name: Build Retail
+        with:
+          args: -r ./zip -z -d -g retail
+
+      - name: Name artifact with git hash
+        run: echo 'ARTIFACT_NAME=Retail-${{ github.event.repository.name }}-'$(git -C ./zip show --no-patch --format="%H") >> $GITHUB_ENV
+
+      - name: Store built zip
+        uses: actions/upload-artifact@v2
+        with:
+          name : ${{ env.ARTIFACT_NAME }}
+          path: ./zip/
+
+
+    env:
+      CF_API_KEY: ${{ secrets.CF_API_KEY }}
+
+  deploy-retail:
+    needs: build-retail
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+
+      - name: Get artifact
+        uses: actions/download-artifact@v2
+        with:
+          name: ${{ env.ARTIFACT_NAME }}
+          path: ./zip/

.gitignore

@@ -1 +1,11 @@
 sublime*
+
+.idea/ElvUI_CoolLine_Wrapper.iml
+
+.idea/misc.xml
+
+.idea/modules.xml
+
+.idea/vcs.xml
+
+.idea/workspace.xml

ElvUI_CoolLine_Wrapper.lua

@@ -28,7 +28,7 @@ end
 function ElvUI_CoolLine_Wrapper:PLAYER_ENTERING_WORLD()
 ------------------------------------------------
     -- ElvUI_CoolLine_Wrapper:logger("PLAYER_ENTERING_WORLD")
-    self:UnregisterEvent("PLAYER_ENTERING_WORLD")
+    --self:UnregisterEvent("PLAYER_ENTERING_WORLD")
     self.CreateMover()
 end
 
@@ -42,9 +42,9 @@ function ElvUI_CoolLine_Wrapper:CreateMover()
     if not E.CreatedMovers[MoverName] then
         if CoolLine.MainFrame then
             CoolLine.MainFrame:SetMovable(false)
-            ElvUI_CoolLine_Wrapper:logger('Making CoolLine frame NOT movable (for ElvUI movers to work !)')
-            E:CreateMover(CoolLine, MoverName, L[MoverName], nil, nil, nil, 'ALL,SOLO,ACTIONSBARS,PARTY,ARENA,RAID')
-            --ElvUI_CoolLine_Wrapper:logger('CreateMover-Mover created !!!!!!!!!!!!!!')
+            --ElvUI_CoolLine_Wrapper:logger('Making CoolLine frame NOT movable (for ElvUI movers to work !)')
+            E:CreateMover(CoolLine.MainFrame, MoverName, L[MoverName], nil, nil, nil, 'ALL,SOLO,ACTIONSBARS,PARTY,ARENA,RAID')
+            ElvUI_CoolLine_Wrapper:logger('CreateMover-Mover created !')
         else
             -- find a way to postpone creation later ?
             ElvUI_CoolLine_Wrapper:logger('CreateMover- CoolLine frame not found/valid ... Find a way to postpone creation later ?')
@@ -248,6 +248,7 @@ function ElvUI_CoolLine_Wrapper:Initialize()
     EP:RegisterPlugin(addonName, ElvUI_CoolLine_Wrapper.InsertOptions)
 
     ElvUI_CoolLine_Wrapper:logger('Initialize-Call update')
+    --ElvUI_CoolLine_Wrapper:CreateMover()
     ElvUI_CoolLine_Wrapper:Update()
 end
 

ElvUI_CoolLine_Wrapper.toc

@@ -1,9 +1,6 @@
-#@retail@
-## Interface: 80000
-#@end-retail@
-#@non-retail@
-# ## Interface: 11303
-#@end-non-retail@
+## Interface: 11307
+## Interface-Retail: 90005
+## Interface-Classic: 11307
 ## Version: @project-version@
 
 ## Title: |cff1784d1ElvUI|r |cff00b3ffCoolLine |cff00ffdaWrapper|r by LoneWanderer-GH