Skip to content

Commit 08cfb67

Browse files
authored
Merge pull request #8 from dbones-labs/feature-updatebuild
small fixes to the build pipeline
2 parents c1eb037 + 1a791ba commit 08cfb67

File tree

2 files changed

+18
-4
lines changed

2 files changed

+18
-4
lines changed

src/template/.circleci/config.yml

+6-4
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,12 @@ jobs:
5858
cd ./src
5959
ls
6060
61+
dotnet nuget add source https://nuget.pkg.github.com/organisation-name/index.json -n github -u dbones -p ${GH_TOKEN} --store-password-in-clear-text
6162
dotnet restore --packages packages
6263
dotnet build --no-restore --configuration Release --force -p:Version=$APP_VERSION
6364
6465
mkdir ./../nupkgs
65-
mv ./bin/**/*.nupkg ./../nupkgs
66+
mv ./**/bin/**/*.nupkg ./../nupkgs
6667
6768
cd ./../nupkgs
6869
rm *.symbols.nupkg
@@ -77,7 +78,7 @@ jobs:
7778

7879
test:
7980
docker:
80-
- image: mcr.microsoft.com/dotnet/core/sdk:5.0
81+
- image: mcr.microsoft.com/dotnet/sdk:5.0
8182
steps:
8283
- attach_workspace:
8384
at: ./
@@ -137,8 +138,9 @@ workflows:
137138
filters:
138139
branches:
139140
ignore:
140-
- docs
141+
- docs-branch
141142
- build:
143+
context: build-ctx
142144
requires:
143145
- setup
144146
- test:
@@ -150,7 +152,7 @@ workflows:
150152
- test
151153
filters:
152154
branches:
153-
only: master
155+
only: main-branch
154156
- publish:
155157
context: build-ctx
156158
requires:

src/template/.template.config/template.json

+12
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,18 @@
2727
"datatype": "text",
2828
"replaces": "project-name",
2929
"defaultValue": ""
30+
},
31+
"main-branch": {
32+
"type": "parameter",
33+
"datatype": "text",
34+
"replaces": "main-branch",
35+
"defaultValue": "main"
36+
},
37+
"docs-branch": {
38+
"type": "parameter",
39+
"datatype": "text",
40+
"replaces": "docs-branch",
41+
"defaultValue": "docs"
3042
}
3143
}
3244
}

0 commit comments

Comments
 (0)