diff --git a/.github/workflows/developer_ci.yml b/.github/workflows/developer_ci.yml index 4c564595..0146ceac 100644 --- a/.github/workflows/developer_ci.yml +++ b/.github/workflows/developer_ci.yml @@ -66,10 +66,11 @@ jobs: - name: Checkout source branch run: git checkout ${{ steps.source_commit.outputs.commit }} - - name: Install + - name: Install appstore run: | - wget https://websoft9.github.io/websoft9/install/install.sh && bash install.sh online + # override cockpit.conf, w9services + sed -i '/#####ci-section#####/a rm -f /etc/cockpit/cockpit.conf && cp cockpit/cockpit.conf /etc/cockpit/cockpit.conf && rm -f /data/apps/w9services && cp -r docker /data/apps/w9services' install/install.sh - - name: Test + - name: Test appmanage API run: | - echo "Test" + echo "Start to test appmanage API" diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 78042d60..18b92544 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -13,6 +13,10 @@ jobs: - name: Checkout code uses: actions/checkout@v2 - - name: Install + - name: Install appstore run: | - wget https://websoft9.github.io/websoft9/install/install.sh && bash install.sh online + cd install && bash install.sh + + - name: Test appmanage API + run: | + echo "Start to test appmanage API" diff --git a/install/install.sh b/install/install.sh index 9b6e58fb..e0476aae 100644 --- a/install/install.sh +++ b/install/install.sh @@ -376,6 +376,8 @@ sudo sed -i 's/ListenStream=9090/ListenStream=9000/' /lib/systemd/system/cockpit # configure cockpit cp /data/apps/websoft9/cockpit/cockpit.conf /etc/cockpit/cockpit.conf +#####ci-section##### + sudo systemctl restart cockpit sudo systemctl daemon-reload sudo systemctl enable --now cockpit @@ -383,8 +385,6 @@ sudo systemctl enable --now cockpit.socket sudo systemctl restart cockpit.socket sudo systemctl restart cockpit -#####ci-section##### - } StartAppMng(){