use reusable workflow of current branch

hredan · Feb 7, 2025 · a97b287 · a97b287
1 parent 96ef962
commit a97b287
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/.github/workflows/build_targets.yml b/.github/workflows/build_targets.yml
@@ -110,8 +110,8 @@ jobs:
         # A file, directory or wildcard pattern that describes what to upload
         path: ./ESPEasyFlasher_linux_armv7.tar.gz
         # The desired behavior if no files are found using the provided path.
-  macOs13:
-    if: ${{ inputs.target == 'macos13' || inputs.target == 'all' }}
+  macOs_x64_executable:
+    if: ${{ inputs.target == 'macos_intel' || inputs.target == 'all' }}
     runs-on: macos-13
     steps:
     - uses: actions/checkout@v4
@@ -125,18 +125,18 @@ jobs:
         pip install pyinstaller
         pip install esptool
         ./Scripts/build_macOS.sh
-        tar -czf ./dist/ESPEasyFlasher_macOs13_intel.tar.gz -C ./dist ./ESPEasyFlasher.app
+        tar -czf ./dist/ESPEasyFlasher_macOs_intel.tar.gz -C ./dist ./ESPEasyFlasher.app
     - name: Create macOs Artefact
       uses: actions/upload-artifact@v4
       with:
         # Artifact name
-        name: espeasyflasher_macOs13_intel
+        name: espeasyflasher_macOs_intel
         # A file, directory or wildcard pattern that describes what to upload
-        path: ./dist/ESPEasyFlasher_macOs13_intel.tar.gz
+        path: ./dist/ESPEasyFlasher_macOs_intel.tar.gz
         retention-days: 10
         # The desired behavior if no files are found using the provided path.
-  macOs14_executable:
-    if: ${{ inputs.target == 'macos14_arm64' || inputs.target == 'all' }}
+  macOs_arm64_executable:
+    if: ${{ inputs.target == 'macos_arm64' || inputs.target == 'all' }}
     runs-on: macos-14
     steps:
     - uses: actions/checkout@v4
@@ -150,14 +150,14 @@ jobs:
         pip install pyinstaller
         pip install esptool
         ./Scripts/build_macOS.sh
-        tar -czf ./dist/ESPEasyFlasher_macOs14_arm64.tar.gz -C ./dist ./ESPEasyFlasher.app
+        tar -czf ./dist/ESPEasyFlasher_macOs_arm64.tar.gz -C ./dist ./ESPEasyFlasher.app
 
     - name: Create macOs Artefact
       uses: actions/upload-artifact@v4
       with:
         # Artifact name
-        name: espeasyflasher_macOs14_arm64
+        name: espeasyflasher_macOs_arm64
         # A file, directory or wildcard pattern that describes what to upload
-        path: ./dist/ESPEasyFlasher_macOs14_arm64.tar.gz
+        path: ./dist/ESPEasyFlasher_macOs_arm64.tar.gz
         retention-days: 10
         # The desired behavior if no files are found using the provided path.
diff --git a/.github/workflows/main_ci_cd.yml b/.github/workflows/main_ci_cd.yml
@@ -7,9 +7,9 @@ on:
 
 jobs:
   test:
-    uses: hredan/ESPEASYFLASHER_2.0/.github/workflows/test.yml@main
+    uses: ./.github/workflows/test.yml
   build-targets:
     needs: test
-    uses: hredan/ESPEASYFLASHER_2.0/.github/workflows/build_targets.yml@34-custom-logo-does-not-shown
+    uses: ./.github/workflows/build_targets.yml
     with:
-      target: 'macos13'
+      target: 'all'