Skip to content

Commit

Permalink
fix(maintenance_scripts: lint: shellcheck_makefile): force shell to s…
Browse files Browse the repository at this point in the history
…h before this got fixed
  • Loading branch information
actionless committed Sep 10, 2024
1 parent 9eb655a commit b2ecdee
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,13 @@ jobs:
run: sed -i -e 's|FROM archlinux:base-devel|FROM actionless/pikaur|' Dockerfile_${PYVER}

- name: build docker image
run: docker build . -f Dockerfile_${PYVER} -t oomox
run: docker build . -f Dockerfile_${PYVER} -t oomox_base16_plugin_test

- name: run ci in docker
run: docker run
-e SKIP_SHELLCHECK=${SKIP_SHELLCHECK}
-e SKIP_MYPY=${SKIP_MYPY}
-e SKIP_VULTURE=${SKIP_VULTURE}
-e THEMIX_GUI_PATH=${THEMIX_GUI_PATH}
oomox:latest
bash -c 'ls -la /bin/sh ; ls -la /bin/bash ; ./maintenance_scripts/lint.sh'
oomox_base16_plugin_test:latest
./maintenance_scripts/lint.sh
2 changes: 1 addition & 1 deletion maintenance_scripts/lint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ else
echo ':: shellcheck passed ::'

echo -e "\n== Running Makefile shellcheck:"
"${THEMIX_GUI_PATH}/maintenance_scripts/makefile_shellcheck.py" ./Makefile_oomox_plugin
"${THEMIX_GUI_PATH}/maintenance_scripts/makefile_shellcheck.py" --shell=sh ./Makefile_oomox_plugin
echo ':: makefile shellcheck passed ::'
fi

Expand Down

0 comments on commit b2ecdee

Please sign in to comment.