Skip to content

Commit

Permalink
Fix CI/CD workflow issues (#5)
Browse files Browse the repository at this point in the history
* Fix CI/CD workflow issues

* Appease the shellcheck gods

* Remove unnecessary flows

* Rename make targets
  • Loading branch information
barraponto authored Nov 8, 2023
1 parent 367a381 commit 05faac3
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 29 deletions.
32 changes: 5 additions & 27 deletions .github/workflows/workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,36 +32,14 @@ jobs:
- name: Setup asdf
uses: asdf-vm/actions/setup@v1

- name: Set up Homebrew
id: set-up-homebrew
uses: Homebrew/actions/setup-homebrew@master

- name: Install bats-core
run: brew install bats-core

- name: Test plugin
run: |
asdf plugin-add dprint $GITHUB_WORKSPACE
asdf plugin-add dprint "$GITHUB_WORKSPACE"
make test
lint:
runs-on: ubuntu-latest

steps:
- name: Checkout code
uses: actions/checkout@v2

- name: Install ShellCheck
run: brew install shellcheck

- name: Run ShellCheck
run: make lint

format:
runs-on: ubuntu-latest

steps:
- name: Checkout code
uses: actions/checkout@v2

- name: Install shfmt
run: brew install shfmt

- name: Run shfmt
run: make fmt-check
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
SH_SRCFILES = $(shell git ls-files "bin/*")
SHFMT_BASE_FLAGS = -s -i 2 -ci

fmt:
format:
shfmt -w $(SHFMT_BASE_FLAGS) $(SH_SRCFILES)
.PHONY: fmt

fmt-check:
format-check:
shfmt -d $(SHFMT_BASE_FLAGS) $(SH_SRCFILES)
.PHONY: fmt-check

Expand Down

0 comments on commit 05faac3

Please sign in to comment.