Merge remote-tracking branch 'upstream/develop' into shallow_clone

Fixed to use GIT_REV_ADJ

.github/workflows/ci.yml

@@ -27,8 +27,6 @@ jobs:
           separator: ","
           files: |
             bootstrap-salt.*
-            Gemfile
-            kitchen*.yml
             tests/**
             .github/workflows/**
           files_ignore: |
@@ -126,6 +124,7 @@ jobs:
     with:
       distro-slug: macos-12
       display-name: macOS 12
+      container-slug: macos-12
       timeout: 20
       runs-on: macos-12
       instances: '["stable-3006", "stable-3006-8", "stable-3007", "stable-3007-1", "latest"]'
@@ -141,27 +140,29 @@ jobs:
     with:
       distro-slug: macos-13
       display-name: macOS 13
+      container-slug: macos-13
       timeout: 20
       runs-on: macos-13
       instances: '["stable-3006", "stable-3006-8", "stable-3007", "stable-3007-1", "latest"]'
 
 
-
-  windows-2019:
-    name: Windows 2019
+  macos-14:
+    name: macOS 14
     if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
-    uses: ./.github/workflows/test-windows.yml
+    uses: ./.github/workflows/test-macos.yml
     needs:
       - lint
       - generate-actions-workflow
     with:
-      distro-slug: windows-2019
-      display-name: Windows 2019
+      distro-slug: macos-14
+      display-name: macOS 14
+      container-slug: macOS 14
       timeout: 20
-      runs-on: windows-2019
+      runs-on: macos-14
       instances: '["stable-3006", "stable-3006-8", "stable-3007", "stable-3007-1", "latest"]'
 
 
+
   windows-2022:
     name: Windows 2022
     if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
@@ -172,82 +173,28 @@ jobs:
     with:
       distro-slug: windows-2022
       display-name: Windows 2022
+      container-slug: windows-2022
       timeout: 20
       runs-on: windows-2022
       instances: '["stable-3006", "stable-3006-8", "stable-3007", "stable-3007-1", "latest"]'
 
 
 
-  almalinux-8:
-    name: AlmaLinux 8
+  amazonlinux-2023:
+    name: Amazon 2023
     if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
     uses: ./.github/workflows/test-linux.yml
     needs:
       - lint
       - generate-actions-workflow
     with:
-      distro-slug: almalinux-8
-      display-name: AlmaLinux 8
+      distro-slug: amazonlinux-2023
+      display-name: Amazon 2023
+      container-slug: amazonlinux-2023
       timeout: 20
       instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "latest", "default"]'
 
 
-  almalinux-9:
-    name: AlmaLinux 9
-    if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
-    uses: ./.github/workflows/test-linux.yml
-    needs:
-      - lint
-      - generate-actions-workflow
-    with:
-      distro-slug: almalinux-9
-      display-name: AlmaLinux 9
-      timeout: 20
-      instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "git-master", "latest", "default"]'
-
-
-  amazon-2:
-    name: Amazon 2
-    if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
-    uses: ./.github/workflows/test-linux.yml
-    needs:
-      - lint
-      - generate-actions-workflow
-    with:
-      distro-slug: amazon-2
-      display-name: Amazon 2
-      timeout: 20
-      instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "latest", "default"]'
-
-
-  arch:
-    name: Arch
-    if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
-    uses: ./.github/workflows/test-linux.yml
-    needs:
-      - lint
-      - generate-actions-workflow
-    with:
-      distro-slug: arch
-      display-name: Arch
-      timeout: 20
-      instances: '["git-master", "latest", "default"]'
-
-
-  centos-stream9:
-    name: CentOS Stream 9
-    if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
-    uses: ./.github/workflows/test-linux.yml
-    needs:
-      - lint
-      - generate-actions-workflow
-    with:
-      distro-slug: centos-stream9
-      display-name: CentOS Stream 9
-      timeout: 20
-      instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "git-master", "latest", "default"]'
-
-
   debian-11:
     name: Debian 11
     if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
@@ -258,8 +205,9 @@ jobs:
     with:
       distro-slug: debian-11
       display-name: Debian 11
+      container-slug: debian-11
       timeout: 20
-      instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "git-master", "latest", "default"]'
+      instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "latest", "default"]'
 
 
   debian-12:
@@ -272,120 +220,9 @@ jobs:
     with:
       distro-slug: debian-12
       display-name: Debian 12
+      container-slug: debian-12
       timeout: 20
-      instances: '["stable-3007", "onedir-3007", "stable-3007-1", "git-master", "latest", "default"]'
-
-
-  fedora-39:
-    name: Fedora 39
-    if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
-    uses: ./.github/workflows/test-linux.yml
-    needs:
-      - lint
-      - generate-actions-workflow
-    with:
-      distro-slug: fedora-39
-      display-name: Fedora 39
-      timeout: 20
-      instances: '["stable-3006", "onedir-3006", "stable-3006-8", "latest", "default"]'
-
-
-  fedora-40:
-    name: Fedora 40
-    if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
-    uses: ./.github/workflows/test-linux.yml
-    needs:
-      - lint
-      - generate-actions-workflow
-    with:
-      distro-slug: fedora-40
-      display-name: Fedora 40
-      timeout: 20
-      instances: '["stable-3007", "onedir-3007", "stable-3007-1", "git-master", "latest", "default"]'
-
-
-  gentoo:
-    name: Gentoo
-    if: github.event_name == 'push'
-    uses: ./.github/workflows/test-linux.yml
-    needs:
-      - lint
-      - generate-actions-workflow
-    with:
-      distro-slug: gentoo
-      display-name: Gentoo
-      timeout: 90
-      instances: '["git-master"]'
-
-
-  gentoo-systemd:
-    name: Gentoo (systemd)
-    if: github.event_name == 'push'
-    uses: ./.github/workflows/test-linux.yml
-    needs:
-      - lint
-      - generate-actions-workflow
-    with:
-      distro-slug: gentoo-systemd
-      display-name: Gentoo (systemd)
-      timeout: 90
-      instances: '["git-master"]'
-
-
-  opensuse-15:
-    name: Opensuse 15
-    if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
-    uses: ./.github/workflows/test-linux.yml
-    needs:
-      - lint
-      - generate-actions-workflow
-    with:
-      distro-slug: opensuse-15
-      display-name: Opensuse 15
-      timeout: 20
-      instances: '["latest", "default"]'
-
-
-  oraclelinux-8:
-    name: Oracle Linux 8
-    if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
-    uses: ./.github/workflows/test-linux.yml
-    needs:
-      - lint
-      - generate-actions-workflow
-    with:
-      distro-slug: oraclelinux-8
-      display-name: Oracle Linux 8
-      timeout: 20
-      instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "latest", "default"]'
-
-
-  oraclelinux-9:
-    name: Oracle Linux 9
-    if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
-    uses: ./.github/workflows/test-linux.yml
-    needs:
-      - lint
-      - generate-actions-workflow
-    with:
-      distro-slug: oraclelinux-9
-      display-name: Oracle Linux 9
-      timeout: 20
-      instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "git-master", "latest", "default"]'
-
-
-  photon-4:
-    name: Photon OS 4
-    if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
-    uses: ./.github/workflows/test-linux.yml
-    needs:
-      - lint
-      - generate-actions-workflow
-    with:
-      distro-slug: photon-4
-      display-name: Photon OS 4
-      timeout: 20
-      instances: '["stable-3006", "onedir-3006", "stable-3006-8", "latest", "default"]'
+      instances: '["stable-3007", "git-3007", "onedir-3007", "stable-3007-1", "git-master", "latest", "default"]'
 
 
   photon-5:
@@ -398,8 +235,9 @@ jobs:
     with:
       distro-slug: photon-5
       display-name: Photon OS 5
+      container-slug: photon-5
       timeout: 20
-      instances: '["stable-3006", "onedir-3006", "stable-3006-8", "latest", "default"]'
+      instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "latest", "default"]'
 
 
   rockylinux-8:
@@ -412,6 +250,7 @@ jobs:
     with:
       distro-slug: rockylinux-8
       display-name: Rocky Linux 8
+      container-slug: rockylinux-8
       timeout: 20
       instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "latest", "default"]'
 
@@ -426,22 +265,9 @@ jobs:
     with:
       distro-slug: rockylinux-9
       display-name: Rocky Linux 9
+      container-slug: rockylinux-9
       timeout: 20
-      instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "git-master", "latest", "default"]'
-
-
-  ubuntu-2004:
-    name: Ubuntu 20.04
-    if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
-    uses: ./.github/workflows/test-linux.yml
-    needs:
-      - lint
-      - generate-actions-workflow
-    with:
-      distro-slug: ubuntu-2004
-      display-name: Ubuntu 20.04
-      timeout: 20
-      instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "git-master", "latest", "default"]'
+      instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "latest", "default"]'
 
 
   ubuntu-2204:
@@ -454,22 +280,9 @@ jobs:
     with:
       distro-slug: ubuntu-2204
       display-name: Ubuntu 22.04
+      container-slug: ubuntu-22.04
       timeout: 20
-      instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "git-master", "latest", "default"]'
-
-
-  ubuntu-2404:
-    name: Ubuntu 24.04
-    if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
-    uses: ./.github/workflows/test-linux.yml
-    needs:
-      - lint
-      - generate-actions-workflow
-    with:
-      distro-slug: ubuntu-2404
-      display-name: Ubuntu 24.04
-      timeout: 20
-      instances: '["stable-3007", "onedir-3007", "stable-3007-1", "git-master", "latest", "default"]'
+      instances: '["stable-3006", "git-3006", "onedir-3006", "stable-3006-8", "stable-3007", "git-3007", "onedir-3007", "stable-3007-1", "git-master", "latest", "default"]'
 
 
   set-pipeline-exit-status:
@@ -482,29 +295,15 @@ jobs:
       - generate-actions-workflow
       - macos-12
       - macos-13
-      - windows-2019
+      - macos-14
       - windows-2022
-      - almalinux-8
-      - almalinux-9
-      - amazon-2
-      - arch
-      - centos-stream9
+      - amazonlinux-2023
       - debian-11
       - debian-12
-      - fedora-39
-      - fedora-40
-      - gentoo
-      - gentoo-systemd
-      - opensuse-15
-      - oraclelinux-8
-      - oraclelinux-9
-      - photon-4
       - photon-5
       - rockylinux-8
       - rockylinux-9
-      - ubuntu-2004
       - ubuntu-2204
-      - ubuntu-2404
     if: always()
     steps: