Merge branch 'main' into feat/GH-175-reuse-path-variable-for-bodyfile

.github/workflows/main.yaml

@@ -1,23 +1,27 @@
 name: Test & Build
 
 on:
+  pull_request:
   push:
     paths:
       - 'cmd/**'
       - 'internal/**'
+      - 'acceptance/**'
 
 jobs:
   build:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        go: ['1.20']
+        go: [ '1.21' ]
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-go@v4
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Set up Go
+        uses: actions/setup-go@v4
         with:
           go-version: ${{ matrix.go }}
-      - name: Run Tests...
+      - name: Run unit tests
         run: go test -v -vet=off -race ./...
-      - name: Build...
-        run: go build -race cmd/killgrave/main.go
+      - name: Run acceptance tests
+        run: make acceptance

.github/workflows/release.yml

@@ -10,13 +10,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Set up Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
-          go-version: '1.20'
+          go-version: '1.21'
       - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v4
         if: startsWith(github.ref, 'refs/tags/')

Makefile

@@ -1,7 +1,10 @@
-.PHONY: build
+.PHONY: build test acceptance
+
 build:
 	go build -ldflags "-s -w -X 'github.com/friendsofgo/killgrave/internal/app/cmd._version=`git rev-parse --abbrev-ref HEAD`-`git rev-parse --short HEAD`'" -o bin/killgrave cmd/killgrave/main.go
 
-.PHONY: test
 test:
-	go test -v -vet=off -race ./...
+	go test -v -vet=off -race ./...
+
+acceptance: build
+	@(cd acceptance && go test -count=1 -tags=acceptance -v ./...)