diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 6e97b451..3d9418d3 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -77,8 +77,9 @@ jobs: if: env.APP == 'apphub' - name: Download media.zip from artifacts - uses: actions/download-artifact@v2 + uses: Legit-Labs/action-download-artifact@v2 with: + workflow: media.yml name: media path: ${{env.DIRECTORY}} if: env.APP == 'apphub' diff --git a/.github/workflows/media.yml b/.github/workflows/media.yml index 067a6217..6ea75b9b 100644 --- a/.github/workflows/media.yml +++ b/.github/workflows/media.yml @@ -4,7 +4,7 @@ on: workflow_dispatch: jobs: - Build_New_Version_For_Release: + build: runs-on: ubuntu-latest env: ACCESS_TOKEN: ${{ secrets.CONTENTFUL_GRAPHQLTOKEN }} @@ -16,7 +16,7 @@ jobs: CI: false steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Install GNU Parallel run: sudo apt-get install -y parallel @@ -54,12 +54,11 @@ jobs: echo ${ITEMS[@]} | jq -s '.' > $DATA_DIR/product_${LOCALE:0:2}.json done - - name: Install ossutil + - name: Install and configure Aliyun ossutil run: | wget http://gosspublic.alicdn.com/ossutil/1.7.6/ossutil64 chmod 755 ossutil64 - - name: Configure ossutil - run: ./ossutil64 config -e ${{ secrets.OSS_ENDPOINT }} -i ${{ secrets.OSS_ACCESS_KEY_ID }} -k ${{ secrets.OSS_ACCESS_KEY_SECRET }} + ./ossutil64 config -e ${{ secrets.OSS_ENDPOINT }} -i ${{ secrets.OSS_ACCESS_KEY_ID }} -k ${{ secrets.OSS_ACCESS_KEY_SECRET }} - name: Download logos from oss run: ./ossutil64 cp oss://libs-websoft9-com/Websoft9/logo/product/ $APPSTORE_LOGO_DIR -r --update @@ -70,7 +69,7 @@ jobs: zip -r media.zip media/ - name: Upload media.zip to artifacts - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: media path: media.zip \ No newline at end of file diff --git a/docker/apphub/Dockerfile b/docker/apphub/Dockerfile index 157193d5..3b1eaa3e 100644 --- a/docker/apphub/Dockerfile +++ b/docker/apphub/Dockerfile @@ -1,4 +1,4 @@ -# modify time: 202312081555, you can modify here to trigger Docker Build action +# modify time: 202312081656, you can modify here to trigger Docker Build action FROM python:3.10-slim-bullseye LABEL maintainer="Websoft9" @@ -6,8 +6,6 @@ LABEL version="0.0.6" WORKDIR /websoft9 -ENV LIBRARY_VERSION=0.5.18 -ENV MEDIA_VERSION=0.0.7 ENV websoft9_repo="https://github.com/Websoft9/websoft9" ENV websoft9_artifact="https://w9artifact.blob.core.windows.net/release/websoft9" ENV library_repo="https://github.com/Websoft9/docker-library"