diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b0ab44ad..02df372d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,5 +1,7 @@ name: CI -on: [push] +on: + - pull_request + - push jobs: build: @@ -7,17 +9,17 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - goVer: [1.16, 1.17, 1.18] + goVer: [1.21, 1.22, 1.23] steps: - name: Set up Go ${{ matrix.goVer }} - uses: actions/setup-go@v1 + uses: actions/setup-go@v5 with: go-version: ${{ matrix.goVer }} id: go - name: Check out code into the Go module directory - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Get dependencies run: | @@ -31,4 +33,4 @@ jobs: run: diff -u <(echo -n) <(gofmt -d .) - name: Test - run: go test -v ./... + run: go test ./... diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index dac09932..8b6733c3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -38,7 +38,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v2 with: - go-version: 1.14 + go-version: 1.22 - if: matrix.os == 'ubuntu-latest' run: sudo apt-get update && sudo apt-get install -y gcc-multilib - if: matrix.arch == '386' @@ -47,7 +47,7 @@ jobs: run: echo "RELEASE=gophish-${{ github.event.release.tag_name }}-${{ matrix.releaseos }}-64bit" >> $GITHUB_ENV - if: matrix.os == 'windows-latest' run: echo "RELEASE=gophish-${{ github.event.release.tag_name }}-${{ matrix.releaseos }}-64bit" | Out-File -FilePath $env:GITHUB_ENV -Append # https://github.com/actions/runner/issues/1636 - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Build ${{ matrix.goos }}/${{ matrix.arch }} run: go build -o ${{ matrix.bin }} env: @@ -55,7 +55,7 @@ jobs: GOARCH: ${{ matrix.arch }} CGO_ENABLED: 1 - name: Upload to artifacts - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: ${{ env.RELEASE }} path: ${{ matrix.bin }} @@ -65,8 +65,8 @@ jobs: runs-on: ubuntu-latest needs: build steps: - - uses: actions/checkout@v2 - - uses: actions/download-artifact@v2 + - uses: actions/checkout@v4 + - uses: actions/download-artifact@v4 with: path: bin - name: Package Releases @@ -96,7 +96,7 @@ jobs: done done - name: Upload to artifacts - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: releases path: releases/*.zip @@ -106,7 +106,7 @@ jobs: runs-on: ubuntu-latest needs: package steps: - - uses: actions/download-artifact@v2 + - uses: actions/download-artifact@v4 with: name: releases path: releases/ diff --git a/imap/monitor.go b/imap/monitor.go index da47fc98..b05dd9d2 100644 --- a/imap/monitor.go +++ b/imap/monitor.go @@ -115,8 +115,8 @@ func (im *Monitor) Shutdown() error { return nil } -// checkForNewEmails logs into an IMAP account and checks unread emails -// for the rid campaign identifier. +// checkForNewEmails logs into an IMAP account and checks unread emails for the +// rid campaign identifier. func checkForNewEmails(im models.IMAP) { im.Host = im.Host + ":" + strconv.Itoa(int(im.Port)) // Append port mailServer := Mailbox{ diff --git a/models/campaign.go b/models/campaign.go index debca6ab..3867122f 100644 --- a/models/campaign.go +++ b/models/campaign.go @@ -609,7 +609,7 @@ func PostCampaign(c *Campaign, uid int64) error { return tx.Commit().Error } -//DeleteCampaign deletes the specified campaign +// DeleteCampaign deletes the specified campaign func DeleteCampaign(id int64) error { log.WithFields(logrus.Fields{ "campaign_id": id,