From cf0dd8fb75f4d33f9e07418ee82eaf99790bc037 Mon Sep 17 00:00:00 2001 From: Gianluca Mascolo Date: Mon, 27 Jan 2025 16:22:06 +0100 Subject: [PATCH 1/3] fix makefile --- Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 05eb50b..4737b55 100644 --- a/Makefile +++ b/Makefile @@ -38,6 +38,7 @@ clean: .PHONY: install install: + install -d -m 0755 $(PROFILE_DIRECTORY) ifneq ("$(wildcard .version)","") install -m 0644 -C .version $(PROFILE_DIRECTORY)/.version endif @@ -48,7 +49,8 @@ ifneq ("$(BASHRC_INSTALL_STATUS)","0") endif .PHONY: install-snippets -install-snippets: +install-snippets: install + install -d -m 0755 $(SNIPPETS_DIRECTORY) for snip in $(SNIPPETS); do \ install -m 0755 -C $$snip $(SNIPPETS_DIRECTORY); \ done From 3596018a022eafe01c5d5ed8df2a2958509cc2c3 Mon Sep 17 00:00:00 2001 From: Gianluca Mascolo Date: Mon, 27 Jan 2025 16:26:25 +0100 Subject: [PATCH 2/3] fixci --- .github/workflows/ci.yml | 4 ++-- .github/workflows/release.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a6ea7ba..d9fab1e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,13 +16,13 @@ jobs: # This workflow contains a single job called "build" build: # The type of runner that the job will run on - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 environment: docker # Steps represent a sequence of tasks that will be executed as part of the job steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 # Runs a set of commands using the runners shell - name: Install tools diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ee73762..2c710a1 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -12,7 +12,7 @@ jobs: permissions: contents: write steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Create Package run: | From 84e79ecc3783cebb111f39384edb18fbba96eaf1 Mon Sep 17 00:00:00 2001 From: Gianluca Mascolo Date: Mon, 27 Jan 2025 16:28:53 +0100 Subject: [PATCH 3/3] fix tests --- Makefile | 2 +- tests/automated_tests.exp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 4737b55..26ad787 100644 --- a/Makefile +++ b/Makefile @@ -32,7 +32,7 @@ format: .PHONY: clean clean: - docker-compose down + docker compose down rm -f $(PACKAGE_NAME)_*.tar.gz rm -f .version diff --git a/tests/automated_tests.exp b/tests/automated_tests.exp index f3a802d..7c3d0c0 100755 --- a/tests/automated_tests.exp +++ b/tests/automated_tests.exp @@ -23,7 +23,7 @@ proc abort {} { exit 1 } -spawn docker-compose run --rm shell +spawn docker compose run --rm shell sleep 2 expect "#"