Skip to content

Commit

Permalink
Merge pull request #99 from fradelg/bugfix/ci
Browse files Browse the repository at this point in the history
Bugfix/ci
  • Loading branch information
fradelg authored Jan 19, 2023
2 parents 90ad75a + d621792 commit 37334bf
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ on:

jobs:
test:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- name: Checkout the code
uses: actions/checkout@v3
- name: Test Bash scripts
run: sudo apt-get -qq update && sudo apt-get install -y devscripts shellcheck && make test
build:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
needs: test
steps:
- name: Checkout the code
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
data
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ test:
# Checking for syntax errors
set -e; for SCRIPT in *.sh; \
do \
sh -n $$SCRIPT; \
bash -n $$SCRIPT; \
done

# Checking for bashisms (currently not failing, but only listing)
Expand Down
2 changes: 1 addition & 1 deletion backup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ do
if [ -n "$MAX_BACKUPS" ]
then
# Execute the delete script, delete older backup or other custom delete script
/delete.sh $db $EXT
/delete.sh "$db" $EXT
fi
else
rm -rf "$FILENAME"
Expand Down
1 change: 0 additions & 1 deletion run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ fi

function final_backup {
echo "=> Captured trap for final backup"
DATE=$(date +%Y%m%d%H%M)
echo "=> Requested last backup at $(date "+%Y-%m-%d %H:%M:%S")"
exec /backup.sh
exit 0
Expand Down

0 comments on commit 37334bf

Please sign in to comment.