Skip to content

Commit

Permalink
feat: improve
Browse files Browse the repository at this point in the history
  • Loading branch information
lcxfs1991 committed Jan 22, 2024
1 parent 25784b7 commit 40381a6
Show file tree
Hide file tree
Showing 2 changed files with 51 additions and 51 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/docker-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@ jobs:
- name: Fetch default.conf
uses: valitydev/action-download-file@v1
with:
url: https://raw.githubusercontent.com/lcxfs1991/docschina-deployment/main/webpack4/default.conf
url: https://raw.githubusercontent.com/lcxfs1991/docschina-deployment/main/webpack5/default.conf
target-path: .

- name: Fetch Dockerfile
uses: valitydev/action-download-file@v1
with:
url: https://raw.githubusercontent.com/lcxfs1991/docschina-deployment/main/webpack4/Dockerfile
url: https://raw.githubusercontent.com/lcxfs1991/docschina-deployment/main/webpack5/Dockerfile
target-path: .


Expand All @@ -57,13 +57,13 @@ jobs:
context: .
push: true
platforms: linux/amd64
tags: ccr.ccs.tencentyun.com/docschina/webpack4:${{ env.BRANCH_NAME }}-${{ env.TIMESTAMP }}
tags: ccr.ccs.tencentyun.com/docschina/webpack5:${{ env.BRANCH_NAME }}-${{ env.TIMESTAMP }}

- name: Deployment
uses: TencentCloud/cli-action@v1
with:
secret_id: ${{ secrets.SECRET_ID }}
secret_key: ${{ secrets.SECRET_KEY }}
region: ${{ secrets.LIGHTHOUSE_REGION }}
commands: tat InvokeCommand --cli-unfold-argument --region ap-shanghai --CommandId cmd-boc4aaiw --InstanceIds lhins-nkwfootc --Parameters '{"deployment":"webpack4","image":"ccr.ccs.tencentyun.com/docschina/webpack4:${{ env.BRANCH_NAME }}-${{ env.TIMESTAMP }}"}'
commands: tat InvokeCommand --cli-unfold-argument --region ap-shanghai --CommandId cmd-boc4aaiw --InstanceIds lhins-nkwfootc --Parameters '{"deployment":"webpack5","image":"ccr.ccs.tencentyun.com/docschina/webpack5:${{ env.BRANCH_NAME }}-${{ env.TIMESTAMP }}"}'
output_format: json
94 changes: 47 additions & 47 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -1,47 +1,47 @@
# # This file should modified carefully.

# name: CI

# # Controls when the action will run. Triggers the workflow on push or pull request
# # events but only for the master branch
# on:
# push:
# branches: [cn]

# # A workflow run is made up of one or more jobs that can run sequentially or in parallel
# jobs:
# # This workflow contains a single job called "build"
# build:
# # The type of runner that the job will run on
# runs-on: ubuntu-latest

# # Steps represent a sequence of tasks that will be executed as part of the job
# steps:
# # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
# - uses: actions/checkout@v2

# - name: Install
# run: |
# yarn
# yarn clean

# - name: Build
# run: |
# yarn build

# - name: Check Build
# run: |
# sudo -i
# sudo chown -R $USER ./dist

# - name: Docschina Github Action
# id: deployStatic
# uses: lcxfs1991/docschina-actions@master
# with:
# skipFiles: ${{ secrets.SKIP_FILES }}
# secretId: ${{ secrets.SECRET_ID }}
# secretKey: ${{ secrets.SECRET_KEY }}
# staticSrcPath: ./dist
# bucket: ${{ secrets.BUCKET }}
# region: ${{ secrets.REGION }}
# forceFiles: ${{ secrets.FORCE_FILES }}
# This file should modified carefully.

name: CI

# Controls when the action will run. Triggers the workflow on push or pull request
# events but only for the master branch
on:
push:
branches: []

# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
# This workflow contains a single job called "build"
build:
# The type of runner that the job will run on
runs-on: ubuntu-latest

# Steps represent a sequence of tasks that will be executed as part of the job
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v2

- name: Install
run: |
yarn
yarn clean
- name: Build
run: |
yarn build
- name: Check Build
run: |
sudo -i
sudo chown -R $USER ./dist
- name: Docschina Github Action
id: deployStatic
uses: lcxfs1991/docschina-actions@master
with:
skipFiles: ${{ secrets.SKIP_FILES }}
secretId: ${{ secrets.SECRET_ID }}
secretKey: ${{ secrets.SECRET_KEY }}
staticSrcPath: ./dist
bucket: ${{ secrets.BUCKET }}
region: ${{ secrets.REGION }}
forceFiles: ${{ secrets.FORCE_FILES }}

0 comments on commit 40381a6

Please sign in to comment.