Skip to content

Commit

Permalink
Merge branch 'main' of github.com:Armaldio/cyn
Browse files Browse the repository at this point in the history
  • Loading branch information
Armaldio committed Jul 18, 2024
2 parents 2debcf5 + 10979e6 commit 9c6989a
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 3 deletions.
10 changes: 10 additions & 0 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"image": "mcr.microsoft.com/devcontainers/universal:2",
"features": {
"ghcr.io/devcontainers/features/node": {
"version": "22"
},
"ghcr.io/devcontainers-contrib/features/corepack:1": {},
"ghcr.io/devcontainers-contrib/features/tsx:1": {}
}
}
5 changes: 3 additions & 2 deletions .github/workflows/push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ name: Electron Forge CI/CD
on:
push:
branches: [ main ]
tags:
- "*"
pull_request:
branches: [ main ]

Expand Down Expand Up @@ -56,7 +58,7 @@ jobs:
discussions: write
needs: build-and-test
runs-on: ubuntu-latest
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
if: startsWith(github.ref, 'refs/tags/')

steps:
- uses: actions/checkout@v4
Expand All @@ -71,7 +73,6 @@ jobs:
with:
files: |
artifacts/**/*
tag_name: ${{ github.ref }}
name: Release ${{ github.ref }}
draft: false
prerelease: false
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cyn/app",
"version": "1.1.5",
"version": "1.1.6",
"description": "-",
"main": ".vite/build/main.js",
"author": "Armaldio",
Expand Down

0 comments on commit 9c6989a

Please sign in to comment.