1 Commits

Author SHA1 Message Date
renovate[bot]
3c6b1aeec9 chore(deps): update dependency electron-builder to v23.6.0 2024-08-04 16:56:42 +00:00
7 changed files with 35 additions and 46 deletions

View File

@@ -78,52 +78,44 @@ 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
# working-directory: website
# run: docker image build -t wxmp .
- name: Build and push multi-platform image
- name: Build wxmp image
working-directory: website
run: |
docker buildx build \
--platform linux/amd64,linux/arm64 \
-t ${{ secrets.DOCKER_USER }}/wxmp:latest \
--push .
run: docker image build -t wxmp .
- name: Build and push multi-platform image (with tag)
- 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
- name: Tags & Push image
if: needs.build.outputs.successful
working-directory: website
run: |
docker buildx build \
--platform linux/amd64,linux/arm64 \
-t ${{ secrets.DOCKER_USER }}/wxmp:${{ needs.build.outputs.version }} \
--push .
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}}
# # Create Docker Image in GitHub
# - name: Login to GitHub registry
# run: echo ${{ github.token }} | docker login ghcr.io -u ${{ github.actor }} --password-stdin
# Create Docker Image in GitHub
- name: Login to GitHub registry
run: echo ${{ github.token }} | docker login ghcr.io -u ${{ github.actor }} --password-stdin
# - name: Build docker image
# working-directory: website
# run: docker build -t ghcr.io/jaywcjlove/wxmp:latest .
- name: Build docker image
working-directory: website
run: docker build -t ghcr.io/jaywcjlove/wxmp:latest .
# - name: Publish to GitHub registry
# run: docker push ghcr.io/jaywcjlove/wxmp:latest
- name: Publish to GitHub registry
run: docker push ghcr.io/jaywcjlove/wxmp:latest
# - name: Tag docker image (beta) and publish to GitHub registry
# if: needs.build.outputs.successful
# run: |
# echo "version: v${{ needs.build.outputs.version }}"
# docker tag ghcr.io/jaywcjlove/wxmp:latest ghcr.io/jaywcjlove/wxmp:${{needs.build.outputs.version}}
# docker push ghcr.io/jaywcjlove/wxmp:${{needs.build.outputs.version}}
- name: Tag docker image (beta) and publish to GitHub registry
if: needs.build.outputs.successful
run: |
echo "version: v${{ needs.build.outputs.version }}"
docker tag ghcr.io/jaywcjlove/wxmp:latest ghcr.io/jaywcjlove/wxmp:${{needs.build.outputs.version}}
docker push ghcr.io/jaywcjlove/wxmp:${{needs.build.outputs.version}}
build_windows:
needs: [build]

View File

@@ -4,9 +4,6 @@
[![Buy me a coffee](https://img.shields.io/badge/Buy%20me%20a%20coffee-048754?logo=buymeacoffee)](https://jaywcjlove.github.io/#/sponsor)
[![CI](https://github.com/jaywcjlove/wxmp/actions/workflows/ci.yml/badge.svg)](https://github.com/jaywcjlove/wxmp/actions/workflows/ci.yml)
[![Docker Image Version (latest by date)](https://img.shields.io/docker/v/wcjiang/wxmp?logo=docker)](https://hub.docker.com/r/wcjiang/wxmp)
[![Docker Image Size (latest by date)](https://img.shields.io/docker/image-size/wcjiang/wxmp?logo=docker)](https://hub.docker.com/r/wcjiang/wxmp)
[![Docker Pulls](https://img.shields.io/docker/pulls/wcjiang/wxmp?logo=docker)](https://hub.docker.com/r/wcjiang/wxmp)
[![微信公众号 Markdown 编辑器](https://user-images.githubusercontent.com/1680273/188264183-a6b8cb6a-92e1-4a73-afc5-4f0234b26ed3.png)](https://jaywcjlove.github.io/wxmp)

View File

@@ -2,7 +2,7 @@
"name": "wxmp",
"description": "微信公众号 Markdown 编辑器",
"homepage": "https://github.com/jaywcjlove/wxmp.git",
"version": "2.4.1",
"version": "2.4.0",
"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.1"
"@wcj/wxmp-main": "2.4.0"
},
"devDependencies": {
"@wcj/wxmp-preload": "2.4.1",
"@wcj/wxmp-preload": "2.4.0",
"cpy-cli": "^5.0.0",
"electron": "20.1.3",
"electron-builder": "23.3.3",
"website": "2.4.1"
"electron-builder": "23.6.0",
"website": "2.4.0"
}
}

View File

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

View File

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

View File

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

View File

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