5 Commits

Author SHA1 Message Date
小弟调调
7969fb28a4 released v2.4.1 2025-05-28 02:45:11 +08:00
小弟调调
1955ec9cbd feat: add Apple Silicon (arm64) support for Docker image. #57 2025-05-28 02:11:37 +08:00
小弟调调
54e4188eb0 feat: add Apple Silicon (arm64) support for Docker image. #57 2025-05-28 02:02:03 +08:00
小弟调调
6fe79146d3 feat: add Apple Silicon (arm64) support for Docker image. #57 2025-05-28 01:56:26 +08:00
小弟调调
e7b52e0ebe feat: add Apple Silicon (arm64) support for Docker image. #57 2025-05-28 01:49:14 +08:00
6 changed files with 27 additions and 19 deletions

View File

@@ -78,26 +78,34 @@ jobs:
- run: echo "outputs.create_tag_versionNumber - ${{ needs.build.outputs.create_tag_versionNumber }}" - run: echo "outputs.create_tag_versionNumber - ${{ needs.build.outputs.create_tag_versionNumber }}"
- run: echo "outputs.tag - ${{ needs.build.outputs.tag }}" - run: echo "outputs.tag - ${{ needs.build.outputs.tag }}"
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
# Create Docker Image # Create Docker Image
- name: Docker login - name: Docker login
run: docker login -u ${{ secrets.DOCKER_USER }} -p ${{ secrets.DOCKER_PASSWORD }} 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 working-directory: website
run: docker image build -t wxmp .
- name: Tags & Push image (latest)
run: | run: |
echo "outputs.tag - ${{ needs.build.outputs.version }}" docker buildx build \
docker tag wxmp ${{ secrets.DOCKER_USER }}/wxmp:latest --platform linux/amd64,linux/arm64 \
docker push ${{ secrets.DOCKER_USER }}/wxmp:latest -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 if: needs.build.outputs.successful
working-directory: website
run: | run: |
echo "outputs.tag - ${{ needs.build.outputs.version }}" docker buildx build \
docker tag wxmp ${{ secrets.DOCKER_USER }}/wxmp:${{needs.build.outputs.version}} --platform linux/amd64,linux/arm64 \
docker push ${{ secrets.DOCKER_USER }}/wxmp:${{needs.build.outputs.version}} -t ${{ secrets.DOCKER_USER }}/wxmp:${{ needs.build.outputs.version }} \
--push .
# # Create Docker Image in GitHub # # Create Docker Image in GitHub
# - name: Login to GitHub registry # - name: Login to GitHub registry

View File

@@ -2,7 +2,7 @@
"name": "wxmp", "name": "wxmp",
"description": "微信公众号 Markdown 编辑器", "description": "微信公众号 Markdown 编辑器",
"homepage": "https://github.com/jaywcjlove/wxmp.git", "homepage": "https://github.com/jaywcjlove/wxmp.git",
"version": "2.4.0", "version": "2.4.1",
"main": "main.js", "main": "main.js",
"author": "Kenny Wong <398188662@qq.com>", "author": "Kenny Wong <398188662@qq.com>",
"private": true, "private": true,
@@ -18,13 +18,13 @@
"build": "npm run copy && cross-env NODE_ENV=production electron-builder build --publish=never --config config.json" "build": "npm run copy && cross-env NODE_ENV=production electron-builder build --publish=never --config config.json"
}, },
"dependencies": { "dependencies": {
"@wcj/wxmp-main": "2.4.0" "@wcj/wxmp-main": "2.4.1"
}, },
"devDependencies": { "devDependencies": {
"@wcj/wxmp-preload": "2.4.0", "@wcj/wxmp-preload": "2.4.1",
"cpy-cli": "^5.0.0", "cpy-cli": "^5.0.0",
"electron": "20.1.3", "electron": "20.1.3",
"electron-builder": "23.3.3", "electron-builder": "23.3.3",
"website": "2.4.0" "website": "2.4.1"
} }
} }

View File

@@ -1,6 +1,6 @@
{ {
"name": "@wcj/wxmp-main", "name": "@wcj/wxmp-main",
"version": "2.4.0", "version": "2.4.1",
"main": "./lib/index.js", "main": "./lib/index.js",
"private": true, "private": true,
"scripts": { "scripts": {

View File

@@ -1,6 +1,6 @@
{ {
"name": "@wcj/wxmp-preload", "name": "@wcj/wxmp-preload",
"version": "2.4.0", "version": "2.4.1",
"main": "./lib/index.js", "main": "./lib/index.js",
"private": true, "private": true,
"scripts": { "scripts": {

View File

@@ -1,4 +1,4 @@
{ {
"version": "2.4.0", "version": "2.4.1",
"packages": ["website", "electron/*"] "packages": ["website", "electron/*"]
} }

View File

@@ -1,6 +1,6 @@
{ {
"name": "website", "name": "website",
"version": "2.4.0", "version": "2.4.1",
"private": true, "private": true,
"scripts": { "scripts": {
"start": "kkt start", "start": "kkt start",