Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/dev' into dev
Browse files Browse the repository at this point in the history
# Conflicts:
#	.github/workflows/cd.yml
#	package.json
#	src/pages/Home/questionnaireItem.vue
#	src/pages/View/checkbox.vue
#	src/pages/View/fill.vue
#	src/pages/View/textArea.vue
#	vite.config.ts
  • Loading branch information
xixiIBN5100 committed Sep 18, 2024
2 parents 60039ff + 753b682 commit a58ec69
Show file tree
Hide file tree
Showing 14 changed files with 3,264 additions and 2,375 deletions.
88 changes: 4 additions & 84 deletions .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,91 +7,11 @@ on:
- dev

jobs:
deploy-main:
if: github.ref == 'refs/heads/main'
runs-on: ubuntu-latest
steps:
- name: Check if forked
if: github.event.repository.fork == true
run: echo "This action is running on a forked repository and will not deploy." && exit 0

- name: Checkout repository
uses: actions/checkout@v2

- name: Use Node.js
uses: actions/setup-node@v3
with:
node-version: "18.x"

- name: Install pnpm
run: npm install -g pnpm

- name: Cache
id: cache-dependencies
uses: actions/cache@v3
with:
path: |
**/node_modules
key: ${{ runner.OS }}-${{ hashFiles('**/pnpm-lock.yaml') }}

- name: Installing Dependencies
if: steps.cache-dependencies.outputs.cache-hit != 'true'
run: pnpm install

- name: Read Version
id: version
uses: ashley-taylor/read-json-property-action@v1.0
with:
path: ./package.json
property: version

- name: Building
run: |
pnpm build-only
zip -r assets ./dist/**
- name: Create GitHub Release
id: create_release
uses: actions/create-release@v1
env:
GITHUB_TOKEN: ${{ secrets.ACCESS_TOKEN }}
with:
tag_name: v${{ steps.version.outputs.value }}
release_name: v${{ steps.version.outputs.value }}
draft: false
prerelease: false

- name: Update Release Asset
id: upload-release-asset
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.ACCESS_TOKEN }}
with:
upload_url: ${{ steps.create_release.outputs.upload_url }}
asset_path: ./assets.zip
asset_name: assets.zip
asset_content_type: application/zip

- name: Set up SSH
run: |
mkdir -p ~/.ssh
echo "${{ secrets.DEPLOY_TOKEN_MAIN }}" > ~/.ssh/id_rsa
chmod 600 ~/.ssh/id_rsa
ssh-keyscan -p ${{ secrets.PORT }} ${{ secrets.REMOTE_HOST_MAIN }} >> ~/.ssh/known_hosts
- name: Deploy via Rsync
env:
REMOTE_HOST: ${{ secrets.REMOTE_HOST_MAIN }}
REMOTE_USER: ${{ secrets.REMOTE_USER_MAIN }}
PORT: ${{ secrets.PORT }}
run: |
rsync -avzr --delete -e "ssh -p $PORT -i ~/.ssh/id_rsa" dist/ $REMOTE_USER@$REMOTE_HOST:/www/jh-questionnaire
deploy-dev:
if: github.ref == 'refs/heads/dev'
runs-on: ubuntu-latest
steps:

- name: Check if forked
if: github.event.repository.fork == true
run: echo "This action is running on a forked repository and will not deploy." && exit 0
Expand All @@ -117,19 +37,19 @@ jobs:

- name: Installing Dependencies
if: steps.cache-dependencies.outputs.cache-hit != 'true'
run: pnpm install
run: pnpm install --ignore-scripts

- name: Building
run: |
pnpm build-only
zip -r assets ./dist/**
- name: Upload to Deploy Server (Dev)
uses: easingthemes/ssh-deploy@v2.0.7
env:
SSH_PRIVATE_KEY: ${{ secrets.DEPLOY_TOKEN_DEV }}
SOURCE: "dist/"
TARGET: "/home/github-action-xsx/front"
TARGET: "/var/www/dist"
ARGS: "-avzr --delete"
REMOTE_HOST: ${{ secrets.REMOTE_HOST_DEV }}
REMOTE_USER: ${{ secrets.REMOTE_USER_DEV }}
Loading

0 comments on commit a58ec69

Please sign in to comment.