Merge remote-tracking branch 'upstream/main'
Browse files- .github/workflows/commit.yaml +5 -7
- .github/workflows/update-stable.yml +4 -1
- app/commit.json +1 -1
.github/workflows/commit.yaml
CHANGED
|
@@ -17,19 +17,17 @@ jobs:
|
|
| 17 |
- name: Checkout the code
|
| 18 |
uses: actions/checkout@v3
|
| 19 |
|
| 20 |
-
- name: Get the latest commit hash
|
| 21 |
-
run: echo "COMMIT_HASH=$(git rev-parse HEAD)" >> $GITHUB_ENV
|
| 22 |
-
|
| 23 |
-
|
| 24 |
- name: Setup Node.js
|
| 25 |
uses: actions/setup-node@v4
|
| 26 |
with:
|
| 27 |
node-version: '20'
|
| 28 |
-
|
| 29 |
-
|
| 30 |
-
- name: Update commit file
|
| 31 |
run: |
|
|
|
|
| 32 |
echo "CURRENT_VERSION=$(node -p "require('./package.json').version")" >> $GITHUB_ENV
|
|
|
|
|
|
|
|
|
|
| 33 |
echo "{ \"commit\": \"$COMMIT_HASH\" , \"version\": \"$CURRENT_VERSION\" }" > app/commit.json
|
| 34 |
|
| 35 |
- name: Commit and push the update
|
|
|
|
| 17 |
- name: Checkout the code
|
| 18 |
uses: actions/checkout@v3
|
| 19 |
|
|
|
|
|
|
|
|
|
|
|
|
|
| 20 |
- name: Setup Node.js
|
| 21 |
uses: actions/setup-node@v4
|
| 22 |
with:
|
| 23 |
node-version: '20'
|
| 24 |
+
- name: Get the latest commit hash
|
|
|
|
|
|
|
| 25 |
run: |
|
| 26 |
+
echo "COMMIT_HASH=$(git rev-parse HEAD)" >> $GITHUB_ENV
|
| 27 |
echo "CURRENT_VERSION=$(node -p "require('./package.json').version")" >> $GITHUB_ENV
|
| 28 |
+
|
| 29 |
+
- name: Update commit file
|
| 30 |
+
run: |
|
| 31 |
echo "{ \"commit\": \"$COMMIT_HASH\" , \"version\": \"$CURRENT_VERSION\" }" > app/commit.json
|
| 32 |
|
| 33 |
- name: Commit and push the update
|
.github/workflows/update-stable.yml
CHANGED
|
@@ -158,10 +158,13 @@ jobs:
|
|
| 158 |
echo "$CHANGELOG_CONTENT" >> $GITHUB_OUTPUT
|
| 159 |
echo "EOF" >> $GITHUB_OUTPUT
|
| 160 |
|
| 161 |
-
- name:
|
| 162 |
run: |
|
| 163 |
echo "COMMIT_HASH=$(git rev-parse HEAD)" >> $GITHUB_ENV
|
| 164 |
echo "CURRENT_VERSION=$(node -p "require('./package.json').version")" >> $GITHUB_ENV
|
|
|
|
|
|
|
|
|
|
| 165 |
git pull
|
| 166 |
echo "{ \"commit\": \"$COMMIT_HASH\" , \"version\": \"$CURRENT_VERSION\" }" > app/commit.json
|
| 167 |
git add package.json pnpm-lock.yaml changelog.md app/commit.json
|
|
|
|
| 158 |
echo "$CHANGELOG_CONTENT" >> $GITHUB_OUTPUT
|
| 159 |
echo "EOF" >> $GITHUB_OUTPUT
|
| 160 |
|
| 161 |
+
- name: Get the latest commit hash and version tag
|
| 162 |
run: |
|
| 163 |
echo "COMMIT_HASH=$(git rev-parse HEAD)" >> $GITHUB_ENV
|
| 164 |
echo "CURRENT_VERSION=$(node -p "require('./package.json').version")" >> $GITHUB_ENV
|
| 165 |
+
|
| 166 |
+
- name: Commit and Tag Release
|
| 167 |
+
run: |
|
| 168 |
git pull
|
| 169 |
echo "{ \"commit\": \"$COMMIT_HASH\" , \"version\": \"$CURRENT_VERSION\" }" > app/commit.json
|
| 170 |
git add package.json pnpm-lock.yaml changelog.md app/commit.json
|
app/commit.json
CHANGED
|
@@ -1 +1 @@
|
|
| 1 |
-
{ "commit": "
|
|
|
|
| 1 |
+
{ "commit": "49b02dd885919e24a201f07b1a7b0fd0371b4f85" , "version": "0.0.1" }
|