Final cleanup of debugging, and add support for Arm64 for MacOS

saltstack · Jul 11, 2024 · 9a78885 · 9a78885
1 parent bc7fa40
commit 9a78885
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 219 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -17,14 +17,12 @@ jobs:
       run-tests: ${{ steps.set-output.outputs.run-tests }}
     steps:
       - uses: actions/checkout@v4
-      ## DGM - uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
       - name: Get specific changed files
         id: changed-files
         uses: tj-actions/changed-files@v42
-        ## DGM uses: tj-actions/changed-files@v25
         with:
           separator: ","
           files: |
@@ -49,7 +47,6 @@ jobs:
 
       - name: Upload Exit Status
         if: always()
-        ## DGM uses: actions/upload-artifact@v4
         uses: actions/upload-artifact@v3
         with:
           name: exitstatus
@@ -63,7 +60,6 @@ jobs:
     if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
     steps:
       - uses: actions/checkout@v4
-      ## DGM - uses: actions/checkout@v3
 
       - name: Set up Python 3.10
         uses: actions/setup-python@v4
@@ -88,7 +84,6 @@ jobs:
 
       - name: Upload Exit Status
         if: always()
-        ## DGM uses: actions/upload-artifact@v4
         uses: actions/upload-artifact@v3
         with:
           name: exitstatus
@@ -98,12 +93,10 @@ jobs:
     name: Lint
     runs-on: ubuntu-latest
     needs: collect-changed-files
-    ## DGM container: koalaman/shellcheck-alpine:v0.7.0
     container: koalaman/shellcheck-alpine:latest
     if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
     steps:
       - uses: actions/checkout@v4
-      ## DGM - uses: actions/checkout@v3
       - name: ShellCheck
         run: |
           shellcheck -s sh -f tty bootstrap-salt.sh
@@ -116,7 +109,6 @@ jobs:
 
       - name: Upload Exit Status
         if: always()
-        ## DGM uses: actions/upload-artifact@v4
         uses: actions/upload-artifact@v3
         with:
           name: exitstatus
@@ -533,15 +525,13 @@ jobs:
 
       - name: Download Exit Status Files
         if: always()
-        ## DGM uses: actions/download-artifact@v4
         uses: actions/download-artifact@v3
         with:
           name: exitstatus
           path: exitstatus
 
       - name: Delete Exit Status Artifacts
         if: always()
-        ## DGM uses: geekyeggo/delete-artifact@v3
         uses: geekyeggo/delete-artifact@v4
         with:
           name: exitstatus

diff --git a/.github/workflows/templates/ci-tail.yml b/.github/workflows/templates/ci-tail.yml
@@ -11,15 +11,13 @@
 
       - name: Download Exit Status Files
         if: always()
-        ## DGM uses: actions/download-artifact@v4
         uses: actions/download-artifact@v3
         with:
           name: exitstatus
           path: exitstatus
 
       - name: Delete Exit Status Artifacts
         if: always()
-        ## DGM uses: geekyeggo/delete-artifact@v3
         uses: geekyeggo/delete-artifact@v4
         with:
           name: exitstatus

diff --git a/.github/workflows/templates/ci.yml b/.github/workflows/templates/ci.yml
@@ -17,14 +17,12 @@ jobs:
       run-tests: ${{ steps.set-output.outputs.run-tests }}
     steps:
       - uses: actions/checkout@v4
-      ## DGM - uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
       - name: Get specific changed files
         id: changed-files
         uses: tj-actions/changed-files@v42
-        ## DGM uses: tj-actions/changed-files@v25
         with:
           separator: ","
           files: |
@@ -49,7 +47,6 @@ jobs:
 
       - name: Upload Exit Status
         if: always()
-        ## DGM uses: actions/upload-artifact@v4
         uses: actions/upload-artifact@v3
         with:
           name: exitstatus
@@ -63,7 +60,6 @@ jobs:
     if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
     steps:
       - uses: actions/checkout@v4
-      ## DGM - uses: actions/checkout@v3
 
       - name: Set up Python 3.10
         uses: actions/setup-python@v4
@@ -88,7 +84,6 @@ jobs:
 
       - name: Upload Exit Status
         if: always()
-        ## DGM uses: actions/upload-artifact@v4
         uses: actions/upload-artifact@v3
         with:
           name: exitstatus
@@ -98,12 +93,10 @@ jobs:
     name: Lint
     runs-on: ubuntu-latest
     needs: collect-changed-files
-    ## DGM container: koalaman/shellcheck-alpine:v0.7.0
     container: koalaman/shellcheck-alpine:latest
     if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
     steps:
       - uses: actions/checkout@v4
-      ## DGM - uses: actions/checkout@v3
       - name: ShellCheck
         run: |
           shellcheck -s sh -f tty bootstrap-salt.sh
@@ -116,7 +109,6 @@ jobs:
 
       - name: Upload Exit Status
         if: always()
-        ## DGM uses: actions/upload-artifact@v4
         uses: actions/upload-artifact@v3
         with:
           name: exitstatus

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,9 +1,7 @@
-# v2024.07.XX
+# v2024.07.11
 
 ## What's Changed
 
-## DGM - Removed support for Ruby, Kitchen and kitchen-salt and it's associated utilities
-
 - Migrated to using GitHub Actions
 - Removed support of End-Of-Life OS's, for example: Debian 7, 8, 9 & 10, RHEL 7
 - Removed support for FreeBSD and OpenBSD
@@ -14,8 +12,9 @@
 - Removed '-y' option which was experimental and only on RHEL 7 or less which are now EOL
 - Updated to current stable version of Ruby v3.3.4
 - Removed git-master support for Photon 4 & 5 due to gcc errors building salt.
+- Add support for Arm64 for MacOS
 
-**Full Changelog**: https://github.com/saltstack/salt-bootstrap/compare/v2024.04.03...v2024.06.XX
+**Full Changelog**: https://github.com/saltstack/salt-bootstrap/compare/v2024.04.03...v2024.07.11
 
 # v2024.04.03