Skip to content

Commit

Permalink
ci: fix
Browse files Browse the repository at this point in the history
  • Loading branch information
MuZhou233 committed Jan 26, 2024
1 parent 3830650 commit d20fb3e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 13 deletions.
12 changes: 3 additions & 9 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -96,12 +96,6 @@ jobs:
runs-on: ubuntu-latest
needs: [build-windows, build-web, build-android]
steps:
- name: Set env
run: |
echo "WIN_FILE_NAME=${{ env.APP_NAME }}-windows-${{ github.ref_name }}.zip" >> $GITHUB_ENV
echo "WEB_FILE_NAME=${{ env.APP_NAME }}-web-${{ github.ref_name }}.tar.gz" >> $GITHUB_ENV
echo "AND_FILE_NAME=${{ env.APP_NAME }}-${{ github.ref_name }}.apk" >> $GITHUB_ENV
- uses: actions/checkout@v3
- uses: actions/download-artifact@v4
with:
Expand All @@ -113,7 +107,7 @@ jobs:
- name: Extract web file
run: |
mkdir ./docker/web
tar -zxvf ./docker/$WEB_FILE_NAME -C ./docker/web
tar -zxvf ./docker/${{ env.APP_NAME }}-web-${{ github.ref_name }}.tar.gz -C ./docker/web
- name: Login to GitHub Container Registry
uses: docker/login-action@v3
Expand All @@ -130,5 +124,5 @@ jobs:
tags: tuihub/waiter:${{ github.ref_name }}
build-args: |
WEB_FILE=web/*
WIN_FILE_NAME=$WIN_FILE_NAME
AND_FILE_NAME=$AND_FILE_NAME
WIN_FILE_NAME=${{ env.APP_NAME }}-windows-${{ github.ref_name }}.zip
AND_FILE_NAME=${{ env.APP_NAME }}-${{ github.ref_name }}.apk
4 changes: 0 additions & 4 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ ARG WEB_FILE
ARG WIN_FILE_NAME
ARG AND_FILE_NAME

RUN apk add --no-cache --update miller

RUN rm /etc/nginx/conf.d/default.conf
COPY nginx.conf /etc/nginx/conf.d

Expand All @@ -17,8 +15,6 @@ RUN echo "AND_CLIENT_DOWNLOAD_PATH=/download/android" >> /usr/share/nginx/html/.
COPY ${WIN_FILE_NAME} /download/${WIN_FILE_NAME}
COPY ${AND_FILE_NAME} /download/${AND_FILE_NAME}

RUN apk del miller

ENV WIN_FILE_NAME=${WIN_FILE_NAME}
ENV AND_FILE_NAME=${AND_FILE_NAME}

Expand Down

0 comments on commit d20fb3e

Please sign in to comment.