From 3d92aa086403a7e065c0f36c1874fc22bc6dea3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E5=B0=8F=E7=99=BD?= <296015668@qq.com> Date: Mon, 22 Apr 2024 16:18:32 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=B7=BB=E5=8A=A0=20applets=20=E4=BE=9D?= =?UTF-8?q?=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/release.yml | 15 ++++++++++----- .github/workflows/sync-gitea.yml | 9 +++++++-- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4b16d99..f94f27b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -27,7 +27,7 @@ jobs: with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - + - name: Login to FIT2CLOUD Container Registry uses: docker/login-action@v3 with: @@ -60,7 +60,7 @@ jobs: outputs: type=image,oci-mediatypes=true,compression=zstd,compression-level=3,force-compression=true cache-from: type=gha cache-to: type=gha,mode=max - + - name: Create Tag run: | git config --global user.name "${GITHUB_ACTOR}" @@ -75,16 +75,21 @@ jobs: gh release create ${{ steps.get-version.outputs.version }} --notes "Release ${{ steps.get-version.outputs.version }}" || echo "Release already exists" env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - + - name: Setup Gitea Private Key uses: webfactory/ssh-agent@v0.9.0 with: ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }} - + + - name: Get pip_package.zip + run: | + applets_version=$(curl -s https://api.github.com/repos/jumpserver/applets/releases/latest | grep "tag_name" | awk '{print $2}' | sed 's/"//g' | sed 's/,//g') + wget -qO opt/download/applets/pip_packages.zip https://github.com/jumpserver/applets/releases/download/${applets_version}/pip_packages.zip + - name: Sync to Gitea Repository run: | ssh -o StrictHostKeyChecking=no git@gitea.com || echo "" - rm -rf .git || echo "" + rm -rf .git opt/player || echo "" git clone --depth=1 git@gitea.com:jumpserver/web-static.git mv opt/* web-static/ cd web-static diff --git a/.github/workflows/sync-gitea.yml b/.github/workflows/sync-gitea.yml index 7cd413c..fd84893 100644 --- a/.github/workflows/sync-gitea.yml +++ b/.github/workflows/sync-gitea.yml @@ -6,7 +6,7 @@ on: version: description: 'Build Version' required: true - default: 'v1.1.1' + default: 'v1.1.3' jobs: build: @@ -19,6 +19,11 @@ jobs: run: | bash prepare.sh + - name: Get pip_package.zip + run: | + applets_version=$(curl -s https://api.github.com/repos/jumpserver/applets/releases/latest | grep "tag_name" | awk '{print $2}' | sed 's/"//g' | sed 's/,//g') + wget -qO opt/download/applets/pip_packages.zip https://github.com/jumpserver/applets/releases/download/${applets_version}/pip_packages.zip + - name: Set git config run: | git config --global user.name "${GITHUB_ACTOR}" @@ -32,7 +37,7 @@ jobs: - name: Sync to Gitea Repository run: | ssh -o StrictHostKeyChecking=no git@gitea.com || echo "" - rm -rf .git || echo "" + rm -rf .git opt/player || echo "" git clone --depth=1 git@gitea.com:jumpserver/web-static.git mv opt/* web-static/ cd web-static