Skip to content

Commit a2f1f8a

Browse files
authored
Merge pull request #33 from wednesday-solutions/dev
Dev
2 parents e663e26 + 65b606d commit a2f1f8a

File tree

4 files changed

+16
-16
lines changed

4 files changed

+16
-16
lines changed

.github/workflows/cd-alpha-release.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77

88
jobs:
99
publish:
10-
runs-on: ubuntu-latest
10+
runs-on: macos-latest
1111
strategy:
1212
matrix:
1313
node-version: [16.x]
@@ -38,9 +38,10 @@ jobs:
3838
3939
- name: get-npm-version
4040
id: package-version
41-
uses: martinbeentjes/npm-get-version-action@master
41+
run: |
42+
echo "current-version=$(npm pkg get version | sed 's/"//g')" >> $GITHUB_OUTPUT
4243
43-
- name: Create Beta Release
44+
- name: Create Alpha Release
4445
uses: actions/create-release@latest
4546
env:
4647
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -62,4 +63,4 @@ jobs:
6263
EP_DRAFT: false
6364
EP_PRE_RELEASE: true
6465
run: |
65-
yarn run electron-builder -- --publish always --linux
66+
yarn run electron-builder -- --publish always --win --mac --linux

.github/workflows/cd-beta-release.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,7 @@ on:
77

88
jobs:
99
publish:
10-
# To enable auto publishing to github, update your electron publisher
11-
# # config in package.json > "build" and remove the conditional below
12-
# if: ${{ github.repository_owner == 'electron-react-boilerplate' }}
13-
14-
runs-on: ubuntu-latest
10+
runs-on: macos-latest
1511
strategy:
1612
matrix:
1713
node-version: [16.x]
@@ -42,7 +38,8 @@ jobs:
4238
4339
- name: get-npm-version
4440
id: package-version
45-
uses: martinbeentjes/npm-get-version-action@master
41+
run: |
42+
echo "current-version=$(npm pkg get version | sed 's/"//g')" >> $GITHUB_OUTPUT
4643
4744
- name: Create Beta Release
4845
uses: actions/create-release@latest

.github/workflows/cd-latest-release.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
# # config in package.json > "build" and remove the conditional below
1212
# if: ${{ github.repository_owner == 'electron-react-boilerplate' }}
1313

14-
runs-on: ubuntu-latest
14+
runs-on: macos-latest
1515
strategy:
1616
matrix:
1717
node-version: [16.x]
@@ -80,9 +80,10 @@ jobs:
8080
8181
- name: get-npm-version
8282
id: package-version
83-
uses: martinbeentjes/npm-get-version-action@master
83+
run: |
84+
echo "current-version=$(npm pkg get version | sed 's/"//g')" >> $GITHUB_OUTPUT
8485
85-
- name: Create Beta Release
86+
- name: Create Latest Release
8687
uses: actions/create-release@latest
8788
env:
8889
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -105,4 +106,4 @@ jobs:
105106
EP_DRAFT: false
106107
EP_PRE_RELEASE: false
107108
run: |
108-
yarn run electron-builder -- --publish always --linux
109+
yarn run electron-builder -- --publish always --win --mac --linux

package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-graphql-ts-template",
3-
"version": "1.0.7-beta.0",
3+
"version": "1.0.8-alpha.6",
44
"description": "A React Typescript GraphQL application",
55
"repository": {
66
"type": "git",
@@ -82,7 +82,8 @@
8282
"provider": "github",
8383
"owner": "wednesday-solutions",
8484
"repo": "electron-react-ts-template",
85-
"private": "true"
85+
"private": "true",
86+
"releaseType": "release"
8687
},
8788
"mac": {
8889
"target": {

0 commit comments

Comments
 (0)