diff --git a/PilotGo-web.tar.gz b/PilotGo-web.tar.gz index b3124bfec00e0f3cd7a1ca8c8db40aadd166dc1c..659a259d5a7b1d4d1ef56e342c17f176c06ce8d7 100644 Binary files a/PilotGo-web.tar.gz and b/PilotGo-web.tar.gz differ diff --git a/PilotGo.spec b/PilotGo.spec old mode 100755 new mode 100644 index c0a5ab6240663384305a4e327ca6071ca753167c..41a7a0069dd5229e73be31d0542bd0661a131a80 --- a/PilotGo.spec +++ b/PilotGo.spec @@ -1,14 +1,18 @@ %define debug_package %{nil} Name: PilotGo -Version: 2.0.1 -Release: 2 +Version: 2.1.0 +Release: 1 Summary: PilotGo is a plugable operation platform written in go License: MulanPSL-2.0 URL: https://gitee.com/openeuler/PilotGo -Source0: https://gitee.com/openeuler/PilotGo/%{name}-%{version}.tar.gz -# Web packaged from ace055a5584482443e9fcfcca906cff2949f6c9b +Source0: https://gitee.com/openeuler/PilotGo/repository/archive/v%{version}.tar.gz +# tar -xvf Source0 +# cd %{name}-v%{version}/frontend/ +# run 'yarn install and yarn build' in it +# tar -czvf PilotGo-web.tar.gz ../frontend/dist/ Source1: PilotGo-web.tar.gz + BuildRequires: systemd BuildRequires: golang @@ -30,25 +34,30 @@ Provides: pilotgo-agent = %{version}-%{release} PilotGo agent. %prep -%autosetup -p1 -n %{name}-%{version} +%setup -n %{name}-v%{version} tar -xzvf %{SOURCE1} %build +cp -rf frontend/dist/* src/app/server/resource # server -GO111MODULE=on go build -mod=vendor -o PilotGo-server pkg/app/server/main.go +pushd src/app/server +GOWORK=off GO111MODULE=on go build -mod=vendor -o PilotGo-server -tags="production" main.go +popd # agent -GO111MODULE=on go build -mod=vendor -o PilotGo-agent pkg/app/agent/main.go +pushd src/app/agent +GOWORK=off GO111MODULE=on go build -mod=vendor -o PilotGo-agent main.go +popd %install -mkdir -p %{buildroot}/opt/PilotGo/{server/{frontend,log},agent/log} +mkdir -p %{buildroot}/opt/PilotGo/{server/log,agent/log} # server -install -D -m 0755 PilotGo-server %{buildroot}/opt/PilotGo/server -install -D -m 0644 config_server.yaml.templete %{buildroot}/opt/PilotGo/server/config_server.yaml +install -D -m 0755 src/app/server/PilotGo-server %{buildroot}/opt/PilotGo/server +install -D -m 0644 src/config_server.yaml.templete %{buildroot}/opt/PilotGo/server/config_server.yaml +install -D -m 0644 src/user.xlsx.templete %{buildroot}/opt/PilotGo/server/user.xlsx install -D -m 0644 scripts/service/PilotGo-server.service %{buildroot}%{_unitdir}/PilotGo-server.service -cp -rf frontend/dist %{buildroot}/opt/PilotGo/server/frontend # agent -install -D -m 0755 PilotGo-agent %{buildroot}/opt/PilotGo/agent -install -D -m 0644 config_agent.yaml.templete %{buildroot}/opt/PilotGo/agent/config_agent.yaml +install -D -m 0755 src/app/agent/PilotGo-agent %{buildroot}/opt/PilotGo/agent +install -D -m 0644 src/config_agent.yaml.templete %{buildroot}/opt/PilotGo/agent/config_agent.yaml install -D -m 0644 scripts/service/PilotGo-agent.service %{buildroot}%{_unitdir}/PilotGo-agent.service %post server @@ -70,25 +79,22 @@ install -D -m 0644 scripts/service/PilotGo-agent.service %{buildroot}%{_unitdir} %systemd_postun PilotGo-agent.service %files server -%dir /opt/PilotGo -%dir /opt/PilotGo/server -%dir /opt/PilotGo/server/log /opt/PilotGo/server/PilotGo-server /opt/PilotGo/server/config_server.yaml -%dir /opt/PilotGo/server/frontend -/opt/PilotGo/server/frontend/dist +/opt/PilotGo/server/user.xlsx +/opt/PilotGo/server/log %{_unitdir}/PilotGo-server.service %files agent -%dir /opt/PilotGo -%dir /opt/PilotGo/agent -%dir /opt/PilotGo/agent/log /opt/PilotGo/agent/PilotGo-agent /opt/PilotGo/agent/config_agent.yaml +/opt/PilotGo/agent/log %{_unitdir}/PilotGo-agent.service - %changelog +* Wed Apr 03 2024 jianxinyu - 2.1.0-1 +- Update package to version 2.1.0 + * Wed Sep 13 2023 wubijie - 2.0.1-2 - Modify the README.md file diff --git a/PilotGo-2.0.1.tar.gz b/v2.1.0.tar.gz similarity index 77% rename from PilotGo-2.0.1.tar.gz rename to v2.1.0.tar.gz index d9826271efadd4e894dafa868744a6c1e9a2b402..5bd1e92c8c902a3ee2d1bb59050a4404ca221270 100644 Binary files a/PilotGo-2.0.1.tar.gz and b/v2.1.0.tar.gz differ