Fix conflict
This commit is contained in:
commit
13bc26e89d
10
.github/workflows/webpack.yml
vendored
10
.github/workflows/webpack.yml
vendored
|
@ -32,14 +32,16 @@ jobs:
|
||||||
|
|
||||||
- name: Build
|
- name: Build
|
||||||
run: |
|
run: |
|
||||||
|
# Build one time for release
|
||||||
export NODE_ENV=production
|
export NODE_ENV=production
|
||||||
yarn
|
yarn
|
||||||
yarn build
|
yarn build
|
||||||
mv static dist
|
mv static dist
|
||||||
zip -r static.zip dist
|
zip -r static.zip dist
|
||||||
mkdir -p dist/.github/workflows/
|
# Build one time for showcase
|
||||||
cp .github/workflows/* dist/.github/workflows/
|
export NODE_ENV=development
|
||||||
|
export FE_SUBDIRECTORY=Mangane
|
||||||
|
yarn build
|
||||||
|
|
||||||
- name: Create Draft Release
|
- name: Create Draft Release
|
||||||
id: create_release
|
id: create_release
|
||||||
|
@ -70,4 +72,4 @@ jobs:
|
||||||
- name: Deploy 🚀
|
- name: Deploy 🚀
|
||||||
uses: JamesIves/github-pages-deploy-action@v4
|
uses: JamesIves/github-pages-deploy-action@v4
|
||||||
with:
|
with:
|
||||||
folder: dist
|
folder: static
|
||||||
|
|
Loading…
Reference in a new issue