From 1473faf002af636b182eda19d6f4a49ad657ccdf Mon Sep 17 00:00:00 2001 From: Don Sizemore Date: Thu, 11 Jul 2024 09:14:25 -0400 Subject: [PATCH 1/8] #10681 update shellspec for Debian 12, Rocky 9 --- .github/workflows/shellspec.yml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/shellspec.yml b/.github/workflows/shellspec.yml index 227a74fa00f..9544ca3d747 100644 --- a/.github/workflows/shellspec.yml +++ b/.github/workflows/shellspec.yml @@ -24,25 +24,23 @@ jobs: run: | cd tests/shell shellspec - shellspec-centos7: - name: "CentOS 7" + shellspec-deb12: + name: "Debian 12" runs-on: ubuntu-latest container: - image: centos:7 + image: debian:12 steps: - uses: actions/checkout@v2 - name: Install shellspec run: | curl -fsSL https://github.com/shellspec/shellspec/releases/download/${{ env.SHELLSPEC_VERSION }}/shellspec-dist.tar.gz | tar -xz -C /usr/share ln -s /usr/share/shellspec/shellspec /usr/bin/shellspec - - name: Install dependencies - run: yum install -y ed - name: Run shellspec run: | cd tests/shell shellspec - shellspec-rocky8: - name: "RockyLinux 8" + shellspec-rocky9: + name: "RockyLinux 9" runs-on: ubuntu-latest container: image: rockylinux/rockylinux:8 From 3952280da588d68e9382210a06ee37027d574d15 Mon Sep 17 00:00:00 2001 From: Don Sizemore Date: Fri, 12 Jul 2024 12:45:05 -0400 Subject: [PATCH 2/8] Update .github/workflows/shellspec.yml Co-authored-by: Ben Companjen --- .github/workflows/shellspec.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/shellspec.yml b/.github/workflows/shellspec.yml index 9544ca3d747..60372568add 100644 --- a/.github/workflows/shellspec.yml +++ b/.github/workflows/shellspec.yml @@ -43,7 +43,7 @@ jobs: name: "RockyLinux 9" runs-on: ubuntu-latest container: - image: rockylinux/rockylinux:8 + image: rockylinux/rockylinux:9 steps: - uses: actions/checkout@v2 - name: Install shellspec From bd0e4150adc293e81210ddd7e07554f4729bb132 Mon Sep 17 00:00:00 2001 From: Don Sizemore Date: Mon, 15 Jul 2024 10:52:34 -0400 Subject: [PATCH 3/8] #10681 touch temp file to trigger shellspec run --- tests/shell/trigger_10681 | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 tests/shell/trigger_10681 diff --git a/tests/shell/trigger_10681 b/tests/shell/trigger_10681 new file mode 100644 index 00000000000..e69de29bb2d From bb6d8eddd5f4cfb0396c16187ef56cfd8da82572 Mon Sep 17 00:00:00 2001 From: Don Sizemore Date: Tue, 16 Jul 2024 09:15:05 -0400 Subject: [PATCH 4/8] #10681 Deb12 doesn't install curl by default? --- .github/workflows/shellspec.yml | 2 ++ tests/shell/trigger_10681 | 0 2 files changed, 2 insertions(+) delete mode 100644 tests/shell/trigger_10681 diff --git a/.github/workflows/shellspec.yml b/.github/workflows/shellspec.yml index 60372568add..f8bc3434f13 100644 --- a/.github/workflows/shellspec.yml +++ b/.github/workflows/shellspec.yml @@ -31,6 +31,8 @@ jobs: image: debian:12 steps: - uses: actions/checkout@v2 + - name: install curl + apt-get -y install curl - name: Install shellspec run: | curl -fsSL https://github.com/shellspec/shellspec/releases/download/${{ env.SHELLSPEC_VERSION }}/shellspec-dist.tar.gz | tar -xz -C /usr/share diff --git a/tests/shell/trigger_10681 b/tests/shell/trigger_10681 deleted file mode 100644 index e69de29bb2d..00000000000 From 3e32ff250256aa2f0fad14501fbb2ebe2ea2d106 Mon Sep 17 00:00:00 2001 From: Don Sizemore Date: Tue, 16 Jul 2024 09:17:13 -0400 Subject: [PATCH 5/8] #10681 correct YAML syntax --- .github/workflows/shellspec.yml | 2 +- tests/shell/trigger_10681 | 0 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 tests/shell/trigger_10681 diff --git a/.github/workflows/shellspec.yml b/.github/workflows/shellspec.yml index f8bc3434f13..cdcaf02a810 100644 --- a/.github/workflows/shellspec.yml +++ b/.github/workflows/shellspec.yml @@ -32,7 +32,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: install curl - apt-get -y install curl + run: apt-get -y install curl - name: Install shellspec run: | curl -fsSL https://github.com/shellspec/shellspec/releases/download/${{ env.SHELLSPEC_VERSION }}/shellspec-dist.tar.gz | tar -xz -C /usr/share diff --git a/tests/shell/trigger_10681 b/tests/shell/trigger_10681 new file mode 100644 index 00000000000..e69de29bb2d From e0290a31234909e630081edbb164b42a3bc886c2 Mon Sep 17 00:00:00 2001 From: Don Sizemore Date: Tue, 16 Jul 2024 09:24:24 -0400 Subject: [PATCH 6/8] #10681 ben and phil are okay with nixing Deb12 --- .github/workflows/shellspec.yml | 17 ----------------- tests/shell/trigger_10681 | 0 2 files changed, 17 deletions(-) delete mode 100644 tests/shell/trigger_10681 diff --git a/.github/workflows/shellspec.yml b/.github/workflows/shellspec.yml index cdcaf02a810..3320d9d08a4 100644 --- a/.github/workflows/shellspec.yml +++ b/.github/workflows/shellspec.yml @@ -24,23 +24,6 @@ jobs: run: | cd tests/shell shellspec - shellspec-deb12: - name: "Debian 12" - runs-on: ubuntu-latest - container: - image: debian:12 - steps: - - uses: actions/checkout@v2 - - name: install curl - run: apt-get -y install curl - - name: Install shellspec - run: | - curl -fsSL https://github.com/shellspec/shellspec/releases/download/${{ env.SHELLSPEC_VERSION }}/shellspec-dist.tar.gz | tar -xz -C /usr/share - ln -s /usr/share/shellspec/shellspec /usr/bin/shellspec - - name: Run shellspec - run: | - cd tests/shell - shellspec shellspec-rocky9: name: "RockyLinux 9" runs-on: ubuntu-latest diff --git a/tests/shell/trigger_10681 b/tests/shell/trigger_10681 deleted file mode 100644 index e69de29bb2d..00000000000 From b399404d7436eaff0dcc401c4009a0d34fdcbac4 Mon Sep 17 00:00:00 2001 From: Philip Durbin Date: Mon, 5 Aug 2024 16:03:01 -0400 Subject: [PATCH 7/8] no-op change to test PR #10682 From 8666307da7e8334b7b79be3481a23f84132f151d Mon Sep 17 00:00:00 2001 From: Philip Durbin Date: Mon, 5 Aug 2024 16:04:45 -0400 Subject: [PATCH 8/8] testing #10682 with a no-op change --- tests/shell/spec/spec_helper.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/shell/spec/spec_helper.sh b/tests/shell/spec/spec_helper.sh index 93f19083cd2..0cf2106f5e0 100644 --- a/tests/shell/spec/spec_helper.sh +++ b/tests/shell/spec/spec_helper.sh @@ -22,3 +22,4 @@ spec_helper_configure() { # Available functions: import, before_each, after_each, before_all, after_all : import 'support/custom_matcher' } +