diff --git a/.github/workflows/webpack.yml b/.github/workflows/webpack.yml index 1cfa5bb..20cf594 100644 --- a/.github/workflows/webpack.yml +++ b/.github/workflows/webpack.yml @@ -2,9 +2,9 @@ name: NodeJS with Webpack on: push: - branches: [ "master" ] + branches: ["master"] pull_request: - branches: [ "master" ] + branches: ["master"] jobs: build: @@ -12,29 +12,29 @@ jobs: strategy: matrix: - node-version: [14.x, 16.x, 18.x] + node-version: [20.x] steps: - - uses: actions/checkout@v3 - - - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v3 - with: - node-version: ${{ matrix.node-version }} - - - name: Install dependencies - run: | - npm install -g pnpm - pnpm install - - - name: Build project - run: pnpm run build:h5 - - - name: Deploy on master branch - if: github.ref == 'refs/heads/master' && github.event_name == 'push' && github.event.pull_request == null - run: | - export TRAVIS_COMMIT_MSG="$(git log --format='%h - %B' --no-merges -n 1)" - export TRAVIS_COMMIT_USER="$(git log --no-merges -n 1 --format=%an)" - export TRAVIS_COMMIT_EMAIL="$(git log --no-merges -n 1 --format=%ae)" - export ROT_TOKEN=${{ secrets.GITHUB_TOKEN }} - sh build/deploy-ci.sh + - uses: actions/checkout@v3 + + - name: Use Node.js ${{ matrix.node-version }} + uses: actions/setup-node@v3 + with: + node-version: ${{ matrix.node-version }} + + - name: Install dependencies + run: | + npm install -g pnpm + pnpm install + + - name: Build project + run: pnpm run build:h5 + + - name: Deploy on master branch + if: github.ref == 'refs/heads/master' && github.event_name == 'push' && github.event.pull_request == null + run: | + export COMMIT_MSG="$(git log --format='%h - %B' --no-merges -n 1)" + export COMMIT_USER="$(git log --no-merges -n 1 --format=%an)" + export COMMIT_EMAIL="$(git log --no-merges -n 1 --format=%ae)" + export ROT_TOKEN="${{ secrets.GITHUB_TOKEN }}" + sh build/deploy-ci.sh diff --git a/build/deploy-ci.sh b/build/deploy-ci.sh index c2c9461..67c0a14 100644 --- a/build/deploy-ci.sh +++ b/build/deploy-ci.sh @@ -17,7 +17,7 @@ git clone --depth 1 -b gh-pages --single-branch https://$ROT_TOKEN@github.com/ic cp -rf ../../dist/** . cp -rf ../../README.md . git add -A . -git commit -m "$TRAVIS_COMMIT_MSG" +git commit -m "$COMMIT_MSG" git push origin gh-pages cd ../.. diff --git a/src/pages/login/index.tsx b/src/pages/login/index.tsx index 2cfe3bc..be180e2 100644 --- a/src/pages/login/index.tsx +++ b/src/pages/login/index.tsx @@ -22,7 +22,7 @@ const Login: React.FC = () => { showMessage('令牌格式错误,应为36位UUID字符串'); return false; } - dispatch(auth(token) as any) + auth(token)(dispatch) redirectTo({ url: '/pages/index/index' }); };