Skip to content

Commit

Permalink
Adds fedora testing
Browse files Browse the repository at this point in the history
  • Loading branch information
sobolevn committed May 4, 2021
1 parent 9efae70 commit 28dbdf3
Show file tree
Hide file tree
Showing 211 changed files with 5,892 additions and 1,534 deletions.
19 changes: 19 additions & 0 deletions .ci/docker/fedora/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
FROM fedora:34

LABEL maintainer="mail@sobolevn.me"
LABEL vendor="git-secret team"

RUN dnf -y update \
&& dnf install -y \
# Direct dependencies:
bash \
gawk \
git \
gnupg \
# Assumed to be present:
diffutils \
findutils \
procps \
make \
&& dnf clean all \
&& rm -rf /var/cache/yum
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
vendor/ linguist-vendored
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ on:
workflow_dispatch:

jobs:
build:
docker-ci:
runs-on: ubuntu-latest
strategy:
matrix:
docker-based-test:
- debian
- ubuntu
- alpine
# - fedora
- fedora
# - centos

steps:
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -136,3 +136,5 @@ build/
# Kitchen files
Gemfile.lock
.kitchen/
.gitsecret/keys/random_seed
!*.secret
24 changes: 5 additions & 19 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,11 @@ ci: clean
docker build -f ".ci/docker/$${GITSECRET_DOCKER_ENV}/Dockerfile" -t "$${GITSECRET_DOCKER_ENV}:latest" .
docker run --rm --volume="$${PWD}:/code" -w /code "$${GITSECRET_DOCKER_ENV}" make test

.PHONY: lint
lint:
find src/ .ci/ utils/ -type f -name '*.sh' -print0 | xargs -0 -I {} shellcheck {}
find tests/ -type f -name '*.bats' -o -name '*.bash' -print0 | xargs -0 -I {} shellcheck {}

#
# Manuals:
#
Expand All @@ -71,25 +76,6 @@ build-man: install-ronn clean-man git-secret
touch man/*/*.ronn
export GITSECRET_VERSION=`./git-secret --version` && ronn --roff --organization="sobolevn" --manual="git-secret $${GITSECRET_VERSION}" man/*/*.ronn

#
# Development:
#

.PHONY: install-hooks
install-hooks:
ln -fs "${PWD}/utils/hooks/pre-commit.sh" "${PWD}/.git/hooks/pre-commit"; \
chmod +x "${PWD}/.git/hooks/pre-commit"; sync; \
ln -fs "${PWD}/utils/hooks/post-commit.sh" "${PWD}/.git/hooks/post-commit"; \
chmod +x "${PWD}/.git/hooks/post-commit"; sync

.PHONY: develop
develop: clean build install-hooks

.PHONY: lint
lint:
find src/ .ci/ utils/ -type f -name '*.sh' -print0 | xargs -0 -I {} shellcheck {}
find tests/ -type f -name '*.bats' -o -name '*.bash' -print0 | xargs -0 -I {} shellcheck {}

#
# Packaging:
#
Expand Down
Loading

0 comments on commit 28dbdf3

Please sign in to comment.