Skip to content

Commit f941944

Browse files
fix makefile (#28)
* fix makefile * fixci * fix tests
1 parent 7ee63b9 commit f941944

File tree

4 files changed

+8
-6
lines changed

4 files changed

+8
-6
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ jobs:
1616
# This workflow contains a single job called "build"
1717
build:
1818
# The type of runner that the job will run on
19-
runs-on: ubuntu-latest
19+
runs-on: ubuntu-24.04
2020
environment: docker
2121

2222
# Steps represent a sequence of tasks that will be executed as part of the job
2323
steps:
2424
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
25-
- uses: actions/checkout@v3
25+
- uses: actions/checkout@v4
2626

2727
# Runs a set of commands using the runners shell
2828
- name: Install tools

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
permissions:
1313
contents: write
1414
steps:
15-
- uses: actions/checkout@v3
15+
- uses: actions/checkout@v4
1616

1717
- name: Create Package
1818
run: |

Makefile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,13 @@ format:
3232

3333
.PHONY: clean
3434
clean:
35-
docker-compose down
35+
docker compose down
3636
rm -f $(PACKAGE_NAME)_*.tar.gz
3737
rm -f .version
3838

3939
.PHONY: install
4040
install:
41+
install -d -m 0755 $(PROFILE_DIRECTORY)
4142
ifneq ("$(wildcard .version)","")
4243
install -m 0644 -C .version $(PROFILE_DIRECTORY)/.version
4344
endif
@@ -48,7 +49,8 @@ ifneq ("$(BASHRC_INSTALL_STATUS)","0")
4849
endif
4950

5051
.PHONY: install-snippets
51-
install-snippets:
52+
install-snippets: install
53+
install -d -m 0755 $(SNIPPETS_DIRECTORY)
5254
for snip in $(SNIPPETS); do \
5355
install -m 0755 -C $$snip $(SNIPPETS_DIRECTORY); \
5456
done

tests/automated_tests.exp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ proc abort {} {
2323
exit 1
2424
}
2525

26-
spawn docker-compose run --rm shell
26+
spawn docker compose run --rm shell
2727
sleep 2
2828
expect "#"
2929

0 commit comments

Comments
 (0)