Skip to content

Commit 3c4509a

Browse files
modifying beta version stamp
1 parent 1ccd568 commit 3c4509a

File tree

2 files changed

+60
-43
lines changed

2 files changed

+60
-43
lines changed

Diff for: .github/workflows/create-release.yml

+58-41
Original file line numberDiff line numberDiff line change
@@ -21,36 +21,42 @@ jobs:
2121
with:
2222
node-version: "12.x"
2323

24-
- run: npm ci
25-
working-directory: "./build-scripts"
26-
27-
- name: Version Stamp Code Components
28-
uses: actions/github-script@v2
29-
with:
30-
script: |
31-
const version = require(`${process.env.GITHUB_WORKSPACE}/build-scripts/version-stamp.js`)
32-
version({
33-
majorVersion: ${{ env.MajorVersion }},
34-
minorVersion: ${{ env.MinorVersion }},
35-
buildVersion: ${{ env.BuildVersion }},
36-
manifestsPaths: [
37-
`${process.env.GITHUB_WORKSPACE}/AutoWidthLabel/AutoWidthLabel`,
38-
`${process.env.GITHUB_WORKSPACE}/Breadcrumb/Breadcrumb`,
39-
`${process.env.GITHUB_WORKSPACE}/CommandBar/CommandBar`,
40-
`${process.env.GITHUB_WORKSPACE}/ContextMenu/ContextMenu`,
41-
`${process.env.GITHUB_WORKSPACE}/DetailsList/DetailsList`,
42-
`${process.env.GITHUB_WORKSPACE}/Elevation/Elevation`,
43-
`${process.env.GITHUB_WORKSPACE}/Icon/Icon`,
44-
`${process.env.GITHUB_WORKSPACE}/KeyboardShortcuts/KeyboardShortcuts`,
45-
`${process.env.GITHUB_WORKSPACE}/Nav/Nav`,
46-
`${process.env.GITHUB_WORKSPACE}/Picker/Picker`,
47-
`${process.env.GITHUB_WORKSPACE}/Pivot/Pivot`,
48-
`${process.env.GITHUB_WORKSPACE}/ResizableTextarea/ResizableTextarea`,
49-
`${process.env.GITHUB_WORKSPACE}/TagList/TagList`,
50-
`${process.env.GITHUB_WORKSPACE}/ThemeGenerator/ThemeGenerator`
51-
],
52-
solutionPaths: `${process.env.GITHUB_WORKSPACE}/Solution/src/Other/Solution.xml`}
53-
)
24+
- run: npm ci
25+
working-directory: "./build-scripts"
26+
27+
- name: Version Stamp Code Components
28+
uses: actions/github-script@v2
29+
with:
30+
script: |
31+
const version = require(`${process.env.GITHUB_WORKSPACE}/build-scripts/version-stamp.js`)
32+
version({
33+
majorVersion: ${{ env.MajorVersion }},
34+
minorVersion: ${{ env.MinorVersion }},
35+
buildVersion: ${{ env.BuildVersion }},
36+
manifestsPaths: [
37+
`${process.env.GITHUB_WORKSPACE}/AutoWidthLabel/AutoWidthLabel`,
38+
`${process.env.GITHUB_WORKSPACE}/Breadcrumb/Breadcrumb`,
39+
`${process.env.GITHUB_WORKSPACE}/Calendar/Calendar`,
40+
`${process.env.GITHUB_WORKSPACE}/CommandBar/CommandBar`,
41+
`${process.env.GITHUB_WORKSPACE}/ContextMenu/ContextMenu`,
42+
`${process.env.GITHUB_WORKSPACE}/DetailsList/DetailsList`,
43+
`${process.env.GITHUB_WORKSPACE}/Elevation/Elevation`,
44+
`${process.env.GITHUB_WORKSPACE}/Icon/Icon`,
45+
`${process.env.GITHUB_WORKSPACE}/KeyboardShortcuts/KeyboardShortcuts`,
46+
`${process.env.GITHUB_WORKSPACE}/Nav/Nav`,
47+
`${process.env.GITHUB_WORKSPACE}/Picker/Picker`,
48+
`${process.env.GITHUB_WORKSPACE}/Pivot/Pivot`,
49+
`${process.env.GITHUB_WORKSPACE}/ProgressIndicator/ProgressIndicator`,
50+
`${process.env.GITHUB_WORKSPACE}/ResizableTextarea/ResizableTextarea`,
51+
`${process.env.GITHUB_WORKSPACE}/Shimmer/Shimmer`,
52+
`${process.env.GITHUB_WORKSPACE}/Spinner/Spinner`,
53+
`${process.env.GITHUB_WORKSPACE}/SubwayNav/SubwayNav`,
54+
`${process.env.GITHUB_WORKSPACE}/TagList/TagList`,
55+
`${process.env.GITHUB_WORKSPACE}/ThemeGenerator/ThemeGenerator`
56+
],
57+
solutionPaths: `${process.env.GITHUB_WORKSPACE}/Solution/src/Other/Solution.xml`,
58+
beta: true}
59+
)
5460
5561
- run: npm ci
5662
working-directory: "./AutoWidthLabel"
@@ -83,7 +89,7 @@ jobs:
8389
- run: npm ci
8490
working-directory: "./Shimmer"
8591
- run: npm ci
86-
working-directory: "./Spinner"
92+
working-directory: "./Spinner"
8793
- run: npm ci
8894
working-directory: "./TagList"
8995
- run: npm ci
@@ -107,14 +113,25 @@ jobs:
107113
draft: true
108114
prerelease: true
109115

110-
- name: Upload Release Asset
111-
id: upload-release-asset
112-
uses: actions/upload-release-asset@v1
113-
env:
114-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
115-
with:
116-
upload_url: ${{ steps.create_release.outputs.upload_url }}
117-
asset_path: Solution/bin/Release/Solution.zip
118-
asset_name: PowerCATCodeComponents_unmanaged_${{ env.MajorVersion }}_${{ env.MinorVersion }}_0_${{ env.BuildVersion }}.zip
119-
asset_content_type: application/zip
116+
- name: Upload Release Asset
117+
id: upload-release-asset1
118+
uses: actions/upload-release-asset@v1
119+
env:
120+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
121+
with:
122+
upload_url: ${{ steps.create_release.outputs.upload_url }}
123+
asset_path: Solution/bin/Release/Solution.zip
124+
asset_name: PowerCATCodeComponents_unmanaged_${{ env.MajorVersion }}_${{ env.MinorVersion }}_0_${{ env.BuildVersion }}.zip
125+
asset_content_type: application/zip
120126

127+
- name: Upload Release Asset
128+
id: upload-release-asset2
129+
uses: actions/upload-release-asset@v1
130+
env:
131+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
132+
with:
133+
upload_url: ${{ steps.create_release.outputs.upload_url }}
134+
asset_path: Solution/bin/Release/Solution_managed.zip
135+
asset_name: PowerCATCodeComponents_managed_${{ env.MajorVersion }}_${{ env.MinorVersion }}_0_${{ env.BuildVersion }}.zip
136+
asset_content_type: application/zip
137+

Diff for: build-scripts/version-stamp.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// To test from commandline use the following from the repo root directory
22
// node build-scripts/version-stamp.test.js
3-
module.exports = ({ majorVersion, minorVersion, buildVersion, manifestsPaths, solutionPaths }) => {
3+
module.exports = ({ majorVersion, minorVersion, buildVersion, manifestsPaths, solutionPaths, beta }) => {
44
const fs = require("fs");
55
const path = require("path");
66

@@ -27,7 +27,7 @@ module.exports = ({ majorVersion, minorVersion, buildVersion, manifestsPaths, so
2727
const resultsResx = replace.sync({
2828
files: manifestsPaths.map(f => f + "/strings/*.resx"),
2929
from: /\%VERSION\%/g,
30-
to: `${majorVersion}.${minorVersion}.${buildVersion}`,
30+
to: beta ? `${majorVersion}.${minorVersion}.${buildVersion}-beta`:`${majorVersion}.${minorVersion}.${buildVersion}`,
3131
countMatches: true,
3232
});
3333
console.log(resultsResx);

0 commit comments

Comments
 (0)