diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index b49cb9a..e538e7a 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -1,4 +1,4 @@
-name: Deploy
+name: Auto Deploy
on:
push:
@@ -16,11 +16,16 @@ jobs:
cache: 'yarn'
- name: "Install Dependencies"
run: yarn
+ - name: "Get current date"
+ id: "date"
+ run: echo "::set-output name=date::$(date --rfc-3339=date)"
- name: Deploy with gh-pages
run: |
git remote set-url origin https://git:${GITHUB_TOKEN}@github.com/${GITHUB_REPOSITORY}.git
- yarn deploy -- -u "github-actions-bot "
+ yarn deploy -u "github-actions-bot " -m "$COMMIT_MESSAGE"
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_REPOSITORY: ${{ github.repository }}
-
+ REACT_APP_BACKEND: "https://t-hole.red/"
+ REACT_APP_BUILD_INFO: version-${{steps.date.outputs.date}}
+ COMMIT_MESSAGE: "Build for: ${{ github.event.head_commit.message }}"
diff --git a/package.json b/package.json
index 82eeeda..c5d5cc0 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,7 @@
"start": "react-scripts start",
"build": "react-scripts build",
"test": "echo 'skipped react-scripts test --env=jsdom'",
- "predeploy": "REACT_APP_BUILD_INFO=autodeploy-$(TZ=Asia/Shanghai date +\"%y%m%d_%H:%M:%S\") react-scripts build",
+ "predeploy": "react-scripts build",
"deploy": "gh-pages -d build",
"eject": "react-scripts eject",
"lint": "eslint --fix src/*.js"
diff --git a/src/Common.js b/src/Common.js
index b2b36e8..4d21346 100644
--- a/src/Common.js
+++ b/src/Common.js
@@ -15,7 +15,7 @@ import renderMd from './Markdown';
export { format_time, Time, TitleLine };
-export const API_BASE = '/_api/v1';
+export const API_BASE = `${process.env.REACT_APP_BACKEND || '/'}_api/v1`;
// https://stackoverflow.com/questions/3446170/escape-string-for-use-in-javascript-regex
function escape_regex(string) {
diff --git a/src/infrastructure/widgets.js b/src/infrastructure/widgets.js
index 0507b20..78b4751 100644
--- a/src/infrastructure/widgets.js
+++ b/src/infrastructure/widgets.js
@@ -82,7 +82,9 @@ class LoginPopupSelf extends Component {
通过第三方验证登陆新T树洞
-
+
闭社