Skip to content

Commit

Permalink
Merge branch '0.19-fixes' into 'main'
Browse files Browse the repository at this point in the history
0.19 fixes + update

See merge request xebis/repository-template!46
  • Loading branch information
bruzina committed Dec 19, 2021
2 parents 4f9442a + 7c0316b commit 9457995
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ release:
before_script:
- *default_before_script
- apk add git
script:
- npm install -g semantic-release @semantic-release/gitlab @semantic-release/github @semantic-release/git @semantic-release/changelog
script:
- npx semantic-release
rules:
- if: $CI_COMMIT_BRANCH =~ /^(((0|[1-9]\d*)\.)(((0|[1-9]\d*|x)\.)?x)|main|next(-major)?|beta|alpha)$/ && $CI_PIPELINE_SOURCE != "schedule"
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,6 @@ repos:
language: system
types: [shell]
- repo: https://github.com/zricethezav/gitleaks
rev: v8.2.0
rev: v8.2.2
hooks:
- id: gitleaks
7 changes: 4 additions & 3 deletions scripts/setup
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ LANG=C

function setup() {
# Install pre-commit for commit-msg hook
if pre-commit install -t commit-msg; then
if pre-commit install -t commit-msg 1>/dev/null; then
out 'pre-commit hook is installed.'
else
err 'pre-commit hook installation failed'
Expand All @@ -17,7 +17,7 @@ function setup() {

REPO_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && git rev-parse --show-toplevel)"

pushd "$REPO_DIR"
pushd "$REPO_DIR" 1>/dev/null

# Install pre-commit hook if it's not present or doesn't point to the right location
if [[ ! -L '.git/hooks/pre-commit' ]] || [ "$(readlink .git/hooks/pre-commit)" != '../../scripts/pre-commit' ]; then
Expand Down Expand Up @@ -63,7 +63,7 @@ function setup() {
out 'GL_TOKEN is set.'
fi

popd
popd 1>/dev/null
}

# Main
Expand All @@ -72,6 +72,7 @@ function main() {
err 'Superpowers might be more harmful than useful. Please run as a regular user.'
return "$status_err"
fi

scripts/bootstrap
setup
}
Expand Down
2 changes: 1 addition & 1 deletion tests/helpers/bats-assert
Submodule bats-assert updated 1 files
+4 −6 README.md

0 comments on commit 9457995

Please sign in to comment.