wneessen/go-mail
1
1
Fork 0
mirror of https://github.com/wneessen/go-mail.git synced 2024-11-21 13:20:49 +01:00
Code Issues Projects Releases Packages Wiki Activity

Update SMTP test port variable and CI configuration

Browse source 
Changed the SMTP test server base port and updated the corresponding environment variable name to `TEST_BASEPORT_SMTP`. This ensures consistency across the test setup and CI workflow configuration.
This commit is contained in:
Winni Neessen 2024-11-14 10:45:35 +01:00
parent a70dde5a4d
commit 2bde340428
Signed by: wneessen
GPG key ID: 385AC9889632126E
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/ci.yml vendored
View file

@ -34,6 +34,7 @@ jobs:
PERFORM_UNIX_OPEN_WRITE_TESTS: ${{ vars.PERFORM_UNIX_OPEN_WRITE_TESTS }} PERFORM_UNIX_OPEN_WRITE_TESTS: ${{ vars.PERFORM_UNIX_OPEN_WRITE_TESTS }}
PERFORM_SENDMAIL_TESTS: ${{ vars.PERFORM_SENDMAIL_TESTS }} PERFORM_SENDMAIL_TESTS: ${{ vars.PERFORM_SENDMAIL_TESTS }}
TEST_BASEPORT: ${{ vars.TEST_BASEPORT }} TEST_BASEPORT: ${{ vars.TEST_BASEPORT }}
TEST_BASEPORT_SMTP: ${{ vars.TEST_BASEPORT_SMTP }}
TEST_HOST: ${{ secrets.TEST_HOST }} TEST_HOST: ${{ secrets.TEST_HOST }}
TEST_USER: ${{ secrets.TEST_USER }} TEST_USER: ${{ secrets.TEST_USER }}
TEST_PASS: ${{ secrets.TEST_PASS }} TEST_PASS: ${{ secrets.TEST_PASS }}
@ -129,6 +130,7 @@ jobs:
go: ['1.19', '1.20', '1.21', '1.22', '1.23'] go: ['1.19', '1.20', '1.21', '1.22', '1.23']
env: env:
TEST_BASEPORT: ${{ vars.TEST_BASEPORT }} TEST_BASEPORT: ${{ vars.TEST_BASEPORT }}
TEST_BASEPORT_SMTP: ${{ vars.TEST_BASEPORT_SMTP }}
steps: steps:
- name: Harden Runner - name: Harden Runner
uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1 uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
@ -154,6 +156,7 @@ jobs:
osver: ['14.1', '14.0', 13.4'] osver: ['14.1', '14.0', 13.4']
env: env:
TEST_BASEPORT: ${{ vars.TEST_BASEPORT }} TEST_BASEPORT: ${{ vars.TEST_BASEPORT }}
TEST_BASEPORT_SMTP: ${{ vars.TEST_BASEPORT_SMTP }}
steps: steps:
- name: Checkout Code - name: Checkout Code
uses: actions/checkout@61b9e3751b92087fd0b06925ba6dd6314e06f089 # master uses: actions/checkout@61b9e3751b92087fd0b06925ba6dd6314e06f089 # master
@ -195,6 +198,7 @@ jobs:
env: env:
PERFORM_ONLINE_TEST: ${{ vars.PERFORM_ONLINE_TEST }} PERFORM_ONLINE_TEST: ${{ vars.PERFORM_ONLINE_TEST }}
TEST_BASEPORT: ${{ vars.TEST_BASEPORT }} TEST_BASEPORT: ${{ vars.TEST_BASEPORT }}
TEST_BASEPORT_SMTP: ${{ vars.TEST_BASEPORT_SMTP }}
TEST_HOST: ${{ secrets.TEST_HOST }} TEST_HOST: ${{ secrets.TEST_HOST }}
TEST_USER: ${{ secrets.TEST_USER }} TEST_USER: ${{ secrets.TEST_USER }}
TEST_PASS: ${{ secrets.TEST_PASS }} TEST_PASS: ${{ secrets.TEST_PASS }}

4
smtp/smtp_test.go
View file

@ -53,7 +53,7 @@ const (
var PortAdder atomic.Int32 var PortAdder atomic.Int32
// TestServerPortBase is the base port for the simple SMTP test server // TestServerPortBase is the base port for the simple SMTP test server
var TestServerPortBase int32 = 30025 var TestServerPortBase int32 = 20025
// localhostCert is a PEM-encoded TLS cert generated from src/crypto/tls: // localhostCert is a PEM-encoded TLS cert generated from src/crypto/tls:
// //
@ -234,7 +234,7 @@ var authTests = []authTest{
} }
func init() { func init() {
testPort := os.Getenv("TEST_BASEPORT") testPort := os.Getenv("TEST_BASEPORT_SMTP")
if testPort == "" { if testPort == "" {
return return
} }