mirror of
https://github.com/jaywcjlove/wxmp.git
synced 2026-01-11 15:58:48 +08:00
Compare commits
5 Commits
renovate/m
...
v2.4.1
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7969fb28a4 | ||
|
|
1955ec9cbd | ||
|
|
54e4188eb0 | ||
|
|
6fe79146d3 | ||
|
|
e7b52e0ebe |
30
.github/workflows/ci.yml
vendored
30
.github/workflows/ci.yml
vendored
@@ -78,26 +78,34 @@ jobs:
|
||||
- run: echo "outputs.create_tag_versionNumber - ${{ needs.build.outputs.create_tag_versionNumber }}"
|
||||
- run: echo "outputs.tag - ${{ needs.build.outputs.tag }}"
|
||||
|
||||
- name: Set up Docker Buildx
|
||||
uses: docker/setup-buildx-action@v3
|
||||
|
||||
# Create Docker Image
|
||||
- name: Docker login
|
||||
run: docker login -u ${{ secrets.DOCKER_USER }} -p ${{ secrets.DOCKER_PASSWORD }}
|
||||
|
||||
- name: Build wxmp image
|
||||
# - name: Build wxmp image
|
||||
# working-directory: website
|
||||
# run: docker image build -t wxmp .
|
||||
|
||||
- name: Build and push multi-platform image
|
||||
working-directory: website
|
||||
run: docker image build -t wxmp .
|
||||
|
||||
- name: Tags & Push image (latest)
|
||||
run: |
|
||||
echo "outputs.tag - ${{ needs.build.outputs.version }}"
|
||||
docker tag wxmp ${{ secrets.DOCKER_USER }}/wxmp:latest
|
||||
docker push ${{ secrets.DOCKER_USER }}/wxmp:latest
|
||||
docker buildx build \
|
||||
--platform linux/amd64,linux/arm64 \
|
||||
-t ${{ secrets.DOCKER_USER }}/wxmp:latest \
|
||||
--push .
|
||||
|
||||
|
||||
- name: Tags & Push image
|
||||
- name: Build and push multi-platform image (with tag)
|
||||
if: needs.build.outputs.successful
|
||||
working-directory: website
|
||||
run: |
|
||||
echo "outputs.tag - ${{ needs.build.outputs.version }}"
|
||||
docker tag wxmp ${{ secrets.DOCKER_USER }}/wxmp:${{needs.build.outputs.version}}
|
||||
docker push ${{ secrets.DOCKER_USER }}/wxmp:${{needs.build.outputs.version}}
|
||||
docker buildx build \
|
||||
--platform linux/amd64,linux/arm64 \
|
||||
-t ${{ secrets.DOCKER_USER }}/wxmp:${{ needs.build.outputs.version }} \
|
||||
--push .
|
||||
|
||||
# # Create Docker Image in GitHub
|
||||
# - name: Login to GitHub registry
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
"name": "wxmp",
|
||||
"description": "微信公众号 Markdown 编辑器",
|
||||
"homepage": "https://github.com/jaywcjlove/wxmp.git",
|
||||
"version": "2.4.0",
|
||||
"version": "2.4.1",
|
||||
"main": "main.js",
|
||||
"author": "Kenny Wong <398188662@qq.com>",
|
||||
"private": true,
|
||||
@@ -18,13 +18,13 @@
|
||||
"build": "npm run copy && cross-env NODE_ENV=production electron-builder build --publish=never --config config.json"
|
||||
},
|
||||
"dependencies": {
|
||||
"@wcj/wxmp-main": "2.4.0"
|
||||
"@wcj/wxmp-main": "2.4.1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@wcj/wxmp-preload": "2.4.0",
|
||||
"@wcj/wxmp-preload": "2.4.1",
|
||||
"cpy-cli": "^5.0.0",
|
||||
"electron": "20.1.3",
|
||||
"electron-builder": "23.3.3",
|
||||
"website": "2.4.0"
|
||||
"website": "2.4.1"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@wcj/wxmp-main",
|
||||
"version": "2.4.0",
|
||||
"version": "2.4.1",
|
||||
"main": "./lib/index.js",
|
||||
"private": true,
|
||||
"scripts": {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@wcj/wxmp-preload",
|
||||
"version": "2.4.0",
|
||||
"version": "2.4.1",
|
||||
"main": "./lib/index.js",
|
||||
"private": true,
|
||||
"scripts": {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{
|
||||
"version": "2.4.0",
|
||||
"version": "2.4.1",
|
||||
"packages": ["website", "electron/*"]
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "website",
|
||||
"version": "2.4.0",
|
||||
"version": "2.4.1",
|
||||
"private": true,
|
||||
"scripts": {
|
||||
"start": "kkt start",
|
||||
|
||||
Reference in New Issue
Block a user