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: | diff --git a/Makefile b/Makefile index 05eb50b..26ad787 100644 --- a/Makefile +++ b/Makefile @@ -32,12 +32,13 @@ format: .PHONY: clean clean: - docker-compose down + docker compose down rm -f $(PACKAGE_NAME)_*.tar.gz rm -f .version .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 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 "#"