Merge remote-tracking branch 'origin/master'

# Conflicts:
#	go.mod
#	go.sum
This commit is contained in:
yuzuki999
2023-03-23 09:09:00 +08:00
2 changed files with 10 additions and 11 deletions

View File

@@ -99,7 +99,7 @@ jobs:
CGO_ENABLED: 0 CGO_ENABLED: 0
steps: steps:
- name: Checkout codebase - name: Checkout codebase
uses: actions/checkout@v2 uses: actions/checkout@v3
- name: Show workflow information - name: Show workflow information
id: get_filename id: get_filename
run: | run: |
@@ -107,11 +107,10 @@ jobs:
echo "GOOS: $GOOS, GOARCH: $GOARCH, GOARM: $GOARM, GOMIPS: $GOMIPS, RELEASE_NAME: $_NAME" echo "GOOS: $GOOS, GOARCH: $GOARCH, GOARM: $GOARM, GOMIPS: $GOMIPS, RELEASE_NAME: $_NAME"
echo "::set-output name=ASSET_NAME::$_NAME" echo "::set-output name=ASSET_NAME::$_NAME"
echo "ASSET_NAME=$_NAME" >> $GITHUB_ENV echo "ASSET_NAME=$_NAME" >> $GITHUB_ENV
- name: Set up Go - name: Set up Go
uses: actions/setup-go@v2 uses: actions/setup-go@v3
with: with:
go-version: ^1.18 go-version: 'stable'
- name: Get project dependencies - name: Get project dependencies
run: go mod download run: go mod download
@@ -176,12 +175,12 @@ jobs:
- name: Change the name - name: Change the name
run: | run: |
mv build_assets V2bX-$ASSET_NAME mv build_assets V2bX-$ASSET_NAME
# - name: Upload files to Artifacts - name: Upload files to Artifacts
# uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v3
# with: with:
# name: V2bX-${{ steps.get_filename.outputs.ASSET_NAME }} name: V2bX-${{ steps.get_filename.outputs.ASSET_NAME }}
# path: | path: |
# ./V2bX-${{ steps.get_filename.outputs.ASSET_NAME }}/* ./V2bX-${{ steps.get_filename.outputs.ASSET_NAME }}/*
- name: Upload binaries to release - name: Upload binaries to release
uses: svenstaro/upload-release-action@v2 uses: svenstaro/upload-release-action@v2
if: github.event_name == 'release' if: github.event_name == 'release'

View File

@@ -14,7 +14,7 @@ import (
func (l *Lego) SetProvider() error { func (l *Lego) SetProvider() error {
switch l.config.CertMode { switch l.config.CertMode {
case "http": case "http":
err := l.client.Challenge.SetHTTP01Provider(http01.NewProviderServer("", "5002")) err := l.client.Challenge.SetHTTP01Provider(http01.NewProviderServer("", "80"))
if err != nil { if err != nil {
return err return err
} }