Skip to content

Commit befa8d1

Browse files
kcq888kcq888
authored
Merge pull request #233 from Open-STEM/kq-fix
Kq fix
2 parents c33877f + 544795b commit befa8d1

2 files changed

Lines changed: 107 additions & 109 deletions

File tree

‎.github/workflows/deploy.yml‎

Lines changed: 52 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,60 @@
11
# Simple workflow for deploying static content to GitHub Pages
22
name: Deploy to GitHub Pages
33
on:
4-
# Runs on pushes targeting the default branch
5-
push:
6-
branches: ['main']
7-
# Allows you to run this workflow manually from the Actions tab
8-
workflow_dispatch:
9-
# Sets the GITHUB_TOKEN permissions to allow deployment to GitHub Pages
4+
# Runs on pushes targeting the default branch
5+
push:
6+
branches: ['main']
7+
# Allows you to run this workflow manually from the Actions tab
8+
workflow_dispatch:
9+
# Sets the GITHUB_TOKEN permissions to allow deployment to GitHub Pages
1010
permissions:
11-
contents: read
12-
id-token: write
13-
pages: write
14-
deployments: write
11+
contents: read
12+
id-token: write
13+
pages: write
14+
deployments: write
1515
# Allow one concurrent deployment
1616
concurrency:
17-
group: 'pages'
18-
cancel-in-progress: true
17+
group: 'pages'
18+
cancel-in-progress: true
1919
jobs:
20-
build:
21-
runs-on: ubuntu-latest
22-
steps:
23-
- name: Checkout
24-
uses: actions/checkout@v4
25-
- name: Set up Node ${{ matrix.node-version }}
26-
uses: actions/setup-node@v4
27-
with:
28-
node-version: ${{ matrix.node-version }}
29-
cache: 'npm'
30-
- name: Install dependencies
31-
run: npm install
32-
- name: test
33-
run: npm run test
34-
- name: Build
35-
run: npm run build
36-
env:
37-
GOOGLE_CLIENT_ID: ${{ secrets.GOOGLE_CLIENT_ID }}
38-
GOOGLE_CLIENT_SECRET: ${{ secrets.GOOGLE_CLIENT_SECRET }}
39-
GOOGLE_DEVELOPER_KEY: ${{ secrets.GOOGLE_DEVELOPER_KEY }}
40-
GOOGLE_REDIRECT_URI: ${{ vars.GOOGLE_REDIRECT_URI }}
41-
42-
- name: Upload pages artifact
43-
uses: actions/upload-pages-artifact@v4
44-
with:
45-
# Upload dist repository
46-
path: './dist'
47-
retention-days: 2
20+
build:
21+
runs-on: ubuntu-latest
22+
steps:
23+
- name: Checkout
24+
uses: actions/checkout@v4
25+
- name: Set up Node ${{ matrix.node-version }}
26+
uses: actions/setup-node@v4
27+
with:
28+
node-version: ${{ matrix.node-version }}
29+
cache: 'npm'
30+
- name: Install dependencies
31+
run: npm install
32+
- name: test
33+
run: npm run test
34+
- name: Build
35+
run: npm run build
36+
env:
37+
GOOGLE_AUTH_URL: ${{ vars.GOOGLE_AUTH_URL }}
38+
GOOGLE_CHATAPI_PROXY_TARGET: ${{ vars.GOOGLE_CHATAPI_PROXY_TARGET }}
39+
GOOGLE_REDIRECT_URI: ${{ vars.GOOGLE_REDIRECT_URI }}
4840

49-
# Deployment job
50-
deploy:
51-
environment:
52-
name: github-pages
53-
url: ${{ steps.deployment.outputs.page_url }}
54-
runs-on: ubuntu-latest
55-
needs: build
56-
steps:
57-
- name: Deploy to GitHub Pages
58-
id: deployment
59-
uses: actions/deploy-pages@v4
60-
env:
61-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
41+
- name: Upload pages artifact
42+
uses: actions/upload-pages-artifact@v4
43+
with:
44+
# Upload dist repository
45+
path: './dist'
46+
retention-days: 2
47+
48+
# Deployment job
49+
deploy:
50+
environment:
51+
name: github-pages
52+
url: ${{ steps.deployment.outputs.page_url }}
53+
runs-on: ubuntu-latest
54+
needs: build
55+
steps:
56+
- name: Deploy to GitHub Pages
57+
id: deployment
58+
uses: actions/deploy-pages@v4
59+
env:
60+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/release.yml‎

Lines changed: 55 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,61 @@
11
# github workflow to make a release
22
name: Create release based on a tag
33
on:
4-
push:
5-
tags:
6-
- 'v*' # Trigger when a tag like v1.0.0 is pushed
4+
push:
5+
tags:
6+
- 'v*' # Trigger when a tag like v1.0.0 is pushed
77
permissions:
8-
contents: write # Grants write permission to repository contents
8+
contents: write # Grants write permission to repository contents
99

1010
jobs:
11-
release:
12-
name: Release pushed tag
13-
runs-on: ubuntu-latest
14-
strategy:
15-
matrix:
16-
node-version: [20]
17-
18-
steps:
19-
- name: Checkout
20-
uses: actions/checkout@v4
21-
- name: Set up Node ${{ matrix.node-version }}
22-
uses: actions/setup-node@v4
23-
with:
24-
node-version: ${{ matrix.node-version }}
25-
cache: 'npm'
26-
- name: Install dependencies
27-
run: npm install
28-
- name: test
29-
run: npm run test
30-
- name: Build
31-
run: npm run build
32-
env:
33-
GOOGLE_CLIENT_ID: ${{ secrets.GOOGLE_CLIENT_ID }}
34-
GOOGLE_CLIENT_SECRET: ${{ secrets.GOOGLE_CLIENT_SECRET }}
35-
GOOGLE_DEVELOPER_KEY: ${{ secrets.GOOGLE_DEVELOPER_KEY }}
36-
GOOGLE_REDIRECT_URI: ${{ vars.GOOGLE_REDIRECT_URI }}
37-
- name: Archive site content
38-
uses: thedoctor0/zip-release@master
39-
with:
40-
type: 'tar'
41-
directory: './dist'
42-
filename: ../xrpweb-v${{ github.run_number }}.zip
43-
- name: Debug - List files
44-
run: |
45-
ls -la
46-
ls -la dist/
47-
- name: Create Release
48-
id: create_new_release
49-
uses: softprops/action-gh-release@v2.3.3
50-
with:
51-
tag_name: ${{ github.ref_name }}
52-
name: Release ${{ github.ref_name }}
53-
env:
54-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
55-
- name: Upload Build artifacts
56-
uses: svenstaro/upload-release-action@v2
57-
with:
58-
repo_token: ${{ secrets.GITHUB_TOKEN }}
59-
file: xrpweb-v${{ github.run_number }}.zip
60-
asset_name: artifacts.zip
61-
tag: ${{ github.ref }}
62-
overwrite: true
11+
release:
12+
name: Release pushed tag
13+
runs-on: ubuntu-latest
14+
strategy:
15+
matrix:
16+
node-version: [20]
17+
18+
steps:
19+
- name: Checkout
20+
uses: actions/checkout@v4
21+
- name: Set up Node ${{ matrix.node-version }}
22+
uses: actions/setup-node@v4
23+
with:
24+
node-version: ${{ matrix.node-version }}
25+
cache: 'npm'
26+
- name: Install dependencies
27+
run: npm install
28+
- name: test
29+
run: npm run test
30+
- name: Build
31+
run: npm run build
32+
env:
33+
GOOGLE_AUTH_URL: ${{ vars.GOOGLE_AUTH_URL }}
34+
GOOGLE_CHATAPI_PROXY_TARGET: ${{ vars.GOOGLE_CHATAPI_PROXY_TARGET }}
35+
GOOGLE_REDIRECT_URI: ${{ vars.GOOGLE_REDIRECT_URI }}
36+
- name: Archive site content
37+
uses: thedoctor0/zip-release@master
38+
with:
39+
type: 'tar'
40+
directory: './dist'
41+
filename: ../xrpweb-v${{ github.run_number }}.zip
42+
- name: Debug - List files
43+
run: |
44+
ls -la
45+
ls -la dist/
46+
- name: Create Release
47+
id: create_new_release
48+
uses: softprops/action-gh-release@v2.3.3
49+
with:
50+
tag_name: ${{ github.ref_name }}
51+
name: Release ${{ github.ref_name }}
52+
env:
53+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
54+
- name: Upload Build artifacts
55+
uses: svenstaro/upload-release-action@v2
56+
with:
57+
repo_token: ${{ secrets.GITHUB_TOKEN }}
58+
file: xrpweb-v${{ github.run_number }}.zip
59+
asset_name: artifacts.zip
60+
tag: ${{ github.ref }}
61+
overwrite: true

0 commit comments

Comments
 (0)