Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update fed files #7

Merged
merged 1 commit into from
Nov 18, 2024
Merged

Update fed files #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ jobs:
- uses: actions/checkout@v4
- name: Build Docker
run: |
echo "VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
sed -i -E "s/v[0-9]+\.[0-9]+\.[0-9]+/${VERSION:-v0.0.0}/" "src/supervisord/version.go"

source ./tool.sh
VER=$(date +%Y.%m%d.%H%M)${TAG_SUFFIX};
build_image_no_tag supervisord "alpine-${VER}" src/supervisord.Dockerfile --build-arg "BASE_NAMESPACE=library" --build-arg "BUILD_IMG=golang:alpine" --build-arg "BASE_IMG=alpine"
Expand All @@ -45,17 +48,20 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v5
with:
go-version: 1.22
go-version: 1.23
- name: Build Binary
run: |
echo "VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
sed -i -E "s/v[0-9]+\.[0-9]+\.[0-9]+/${VERSION:-v0.0.0}/" "src/supervisord/version.go"

set -eux
pwd && ls -alh *
mkdir -pv build && mv src/etc src/webgui ./build/
cd src/supervisord
go mod tidy && go test -v
go build -v -o ../../build/
cd ../../
ls -alh build
cd ../../ && ls -alh build
./build/supervisord version

build_goreleaser:
runs-on: ubuntu-latest
Expand All @@ -64,7 +70,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v5
with:
go-version: 1.22
go-version: 1.23

- name: Install cross-compiler for linux/arm64, UPX
env:
Expand All @@ -79,6 +85,8 @@ jobs:
export PATH="/opt/upx/:${PATH}"
upx --version | grep -E '^upx'

echo "VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
sed -i -E "s/v[0-9]+\.[0-9]+\.[0-9]+/${VERSION:-v0.0.0}/" "src/supervisord/version.go"
cd src/supervisord && go mod tidy -e

- if: ${{ !startsWith(github.ref, 'refs/tags/v') }}
Expand Down
2 changes: 1 addition & 1 deletion src/supervisord/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module supervisord

go 1.22
go 1.23

require (
github.com/gorilla/mux v1.8.0
Expand Down
2 changes: 1 addition & 1 deletion src/supervisord/version.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
)

// VERSION the version of supervisor
const VERSION = "v1.0.1"
const VERSION = "v0.0.0"

// VersionCommand implement the flags.Commander interface
type VersionCommand struct {
Expand Down
18 changes: 8 additions & 10 deletions src/webgui/conf.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,14 @@
<meta charset="UTF-8">
<title>ConfFile</title>
<!--导入js库-->
<script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.2.6/ace.js" type="text/javascript"
charset="utf-8"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.2.6/ext-language_tools.js" type="text/javascript"
charset="utf-8"></script>
<script src="js/axios.min.js"></script>
<script src='js/jquery-3.3.1.min.js'></script>
<script src="js/common.js"></script>
<link rel="stylesheet" href="css/bootstrap.min.css"/>
<link rel="stylesheet" href="css/bootstrap-table.css"/>
<link rel="stylesheet" href="css/bootstrap-dialog.min.css"/>
<script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.2.6/ace.js" type="text/javascript" charset="utf-8"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.2.6/ext-language_tools.js" type="text/javascript" charset="utf-8"></script>
<script src="static/axios.min.js"></script>
<script src='static/jquery-3.3.1.min.js'></script>
<script src="static/common.js"></script>
<link rel="stylesheet" href="static/bootstrap.min.css"/>
<link rel="stylesheet" href="static/bootstrap-table.css"/>
<link rel="stylesheet" href="static/bootstrap-dialog.min.css"/>
</head>

<body>
Expand Down
Loading
Loading