diff --git a/.github/workflows/auto-labeler.yml b/.github/workflows/auto-labeler.yml index c2449ca..a4530cf 100644 --- a/.github/workflows/auto-labeler.yml +++ b/.github/workflows/auto-labeler.yml @@ -17,6 +17,6 @@ jobs: steps: - name: Check Labels id: labeler - uses: fuxingloh/multi-labeler@v2 + uses: fuxingloh/multi-labeler@v4 with: github-token: ${{secrets.GITHUB_TOKEN}} diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index 6ee1fb8..25d2899 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -52,7 +52,7 @@ jobs: key: ${{ runner.os }}-benchmark - name: Save Benchmark Results - uses: benchmark-action/github-action-benchmark@v1.18.0 + uses: benchmark-action/github-action-benchmark@v1.19.3 with: tool: "go" output-file-path: output.txt diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index 3060e08..90ef912 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -37,7 +37,7 @@ jobs: go-version: '1.20.x' cache: false - name: golangci-lint - uses: golangci/golangci-lint-action@v3 + uses: golangci/golangci-lint-action@v4 with: # NOTE: Keep this in sync with the version from .golangci.yml version: 'v1.56.1' diff --git a/.github/workflows/release-drafter-ace.yml b/.github/workflows/release-drafter-ace.yml index 759c59e..8b91c65 100644 --- a/.github/workflows/release-drafter-ace.yml +++ b/.github/workflows/release-drafter-ace.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 30 steps: - - uses: release-drafter/release-drafter@v5 + - uses: release-drafter/release-drafter@v6 with: config-name: release-drafter-ace.yml env: diff --git a/.github/workflows/release-drafter-amber.yml b/.github/workflows/release-drafter-amber.yml index e02d4c5..98001cf 100644 --- a/.github/workflows/release-drafter-amber.yml +++ b/.github/workflows/release-drafter-amber.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 30 steps: - - uses: release-drafter/release-drafter@v5 + - uses: release-drafter/release-drafter@v6 with: config-name: release-drafter-amber.yml env: diff --git a/.github/workflows/release-drafter-core.yml b/.github/workflows/release-drafter-core.yml index 09da01e..1a27b70 100644 --- a/.github/workflows/release-drafter-core.yml +++ b/.github/workflows/release-drafter-core.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 30 steps: - - uses: release-drafter/release-drafter@v5 + - uses: release-drafter/release-drafter@v6 with: config-name: release-drafter-core.yml env: diff --git a/.github/workflows/release-drafter-django.yml b/.github/workflows/release-drafter-django.yml index 42ec265..8a5c938 100644 --- a/.github/workflows/release-drafter-django.yml +++ b/.github/workflows/release-drafter-django.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 30 steps: - - uses: release-drafter/release-drafter@v5 + - uses: release-drafter/release-drafter@v6 with: config-name: release-drafter-django.yml env: diff --git a/.github/workflows/release-drafter-handlebars.yml b/.github/workflows/release-drafter-handlebars.yml index 6fe761a..fda471a 100644 --- a/.github/workflows/release-drafter-handlebars.yml +++ b/.github/workflows/release-drafter-handlebars.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 30 steps: - - uses: release-drafter/release-drafter@v5 + - uses: release-drafter/release-drafter@v6 with: config-name: release-drafter-handlebars.yml env: diff --git a/.github/workflows/release-drafter-html.yml b/.github/workflows/release-drafter-html.yml index fab29e0..f70f9e5 100644 --- a/.github/workflows/release-drafter-html.yml +++ b/.github/workflows/release-drafter-html.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 30 steps: - - uses: release-drafter/release-drafter@v5 + - uses: release-drafter/release-drafter@v6 with: config-name: release-drafter-html.yml env: diff --git a/.github/workflows/release-drafter-jet.yml b/.github/workflows/release-drafter-jet.yml index d26618b..6358643 100644 --- a/.github/workflows/release-drafter-jet.yml +++ b/.github/workflows/release-drafter-jet.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 30 steps: - - uses: release-drafter/release-drafter@v5 + - uses: release-drafter/release-drafter@v6 with: config-name: release-drafter-jet.yml env: diff --git a/.github/workflows/release-drafter-mustache.yml b/.github/workflows/release-drafter-mustache.yml index 2ac4257..6924c18 100644 --- a/.github/workflows/release-drafter-mustache.yml +++ b/.github/workflows/release-drafter-mustache.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 30 steps: - - uses: release-drafter/release-drafter@v5 + - uses: release-drafter/release-drafter@v6 with: config-name: release-drafter-mustache.yml env: diff --git a/.github/workflows/release-drafter-pug.yml b/.github/workflows/release-drafter-pug.yml index 440cd9a..cbc20c5 100644 --- a/.github/workflows/release-drafter-pug.yml +++ b/.github/workflows/release-drafter-pug.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 30 steps: - - uses: release-drafter/release-drafter@v5 + - uses: release-drafter/release-drafter@v6 with: config-name: release-drafter-pug.yml env: diff --git a/.github/workflows/release-drafter-slim.yml b/.github/workflows/release-drafter-slim.yml index c8103b5..333e51a 100644 --- a/.github/workflows/release-drafter-slim.yml +++ b/.github/workflows/release-drafter-slim.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 30 steps: - - uses: release-drafter/release-drafter@v5 + - uses: release-drafter/release-drafter@v6 with: config-name: release-drafter-slim.yml env: diff --git a/.golangci.yml b/.golangci.yml index d905a82..a91dd0d 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -40,7 +40,7 @@ linters-settings: - ifElseChain gofumpt: - module-path: github.com/gofiber/fiber + module-path: github.com/gofiber/template extra-rules: true gosec: @@ -227,4 +227,4 @@ linters: - wastedassign - whitespace - wrapcheck - - tenv \ No newline at end of file + - tenv diff --git a/amber/amber_test.go b/amber/amber_test.go index 466c100..35f93df 100644 --- a/amber/amber_test.go +++ b/amber/amber_test.go @@ -175,7 +175,7 @@ func Benchmark_Amber(b *testing.B) { expectExtended := `Main

Header

Hello, Admin!

Footer

` engine := New("./views", ".amber") engine.AddFunc("isAdmin", func(user string) bool { - return user == "admin" + return user == admin }) require.NoError(b, engine.Load()) diff --git a/django/django.go b/django/django.go index 1cff3fc..e71758a 100644 --- a/django/django.go +++ b/django/django.go @@ -36,9 +36,7 @@ func (e *Engine) initialize(directory, extension string, fs http.FileSystem) { e.Engine.LayoutName = "embed" e.Engine.Funcmap = make(map[string]interface{}) e.autoEscape = true - if fs != nil { - e.Engine.FileSystem = fs - } + e.Engine.FileSystem = fs } // New creates a new Engine with a directory and extension.