Skip to content

Commit 6baf19c

Browse files
authored
Merge branch 'master' into fix-pr-release-yml
2 parents bfc65f2 + dc8d8c3 commit 6baf19c

File tree

3 files changed

+32
-2079
lines changed

3 files changed

+32
-2079
lines changed

.github/workflows/pull_request.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,12 @@ jobs:
7474
Code-Coverage:
7575
name: code coverage
7676
runs-on: ubuntu-latest
77+
if: success() || failure()
7778
steps:
7879
- name: Code Coverage
7980
run: echo "TODO Code Coverage"
8081
#continue-on-error: true
81-
82+
8283
All-Checks-Passed:
8384
name: all checks passed
8485
runs-on: ubuntu-latest
@@ -94,8 +95,4 @@ jobs:
9495
- name: all checks passed steps
9596
run: echo "allow all checks to run incase multiple fails then fail here"
9697

97-
98-
99-
10098

101-

.github/workflows/release.yml

Lines changed: 30 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -152,30 +152,50 @@ jobs:
152152
with:
153153
global-json-file: global.json
154154

155+
- name: Remove Local PackageSettings (CI Only)
156+
run: rm -f PackageSettings.props.local
157+
155158
- name: Replace local environment variable in nuget config because cant provide it as a parameter
156159
run: |
160+
echo "sed -i \"s|%LocalPackagePath%|$BCL_Source|g\" nuget.config"
157161
sed -i "s|%LocalPackagePath%|$BCL_Source|g" nuget.config
158162
sed -i "s|%GITHUB_USERNAME%|$GITHUB_USERNAME|g" nuget.config
159163
sed -i "s|%GITHUB_PACKAGES_TOKEN%|$PACKAGES_TOKEN |g" nuget.config
160-
164+
165+
- name: debug BCL_VERSION
166+
run: |
167+
echo "BCL_VERSION $BCL_VERSION"
161168
162169
- name: Clean lock files because the newly generated package file will superseed the locks
163170
run: |
171+
echo "Listing packages.lock.json files:"
172+
find . -name "packages.lock.json" -type f -print
173+
echo ""
174+
echo "Deleting packages.lock.json files:"
164175
find . -name "packages.lock.json" -type f -exec rm -f {} \;
165-
166-
- name: Restore NuGet Packages for Specifically the BCL Package Library Project
167-
run: dotnet restore TestHostPrerenderWASM/TestHostPrerenderWASM.Client/TestHostPrerenderWASM.Client.csproj
168-
169-
- name: Create docs directory
170-
run: mkdir -p docs
171176
172-
# Hardcode the INDEPENDENT_CLIENT_GH_PAGES value
173-
# Blazor client so appsetting in wwwroot and public
177+
echo "Listing packages.lock.json files:"
178+
find . -name "packages.lock.json" -type f -print
179+
180+
- name: Build Shared Pages
181+
run: |
182+
dotnet build SharedPages -c Release \
183+
/p:BCLVersion=$BCL_VERSION \
184+
/p:NupkgOutputPath=$NUPKG_OUTPUT_PATH \
185+
/p:UseBCLProjectReference=$USE_BCL_PROJECT_REFERENCE \
186+
/p:GhPageRelease=false \
187+
/p:LocalPackagePath=$BCL_Source
188+
189+
# Blazor client so appsetting in wwwroot and public
174190
- name: Modify appsettings.json with hardcoded value
175191
run: |
176192
jq '.INDEPENDENT_CLIENT_GH_PAGES = "true"' TestHostPrerenderWASM/TestHostPrerenderWASM.Client/wwwroot/appsettings.json > tmp.json && mv tmp.json TestHostPrerenderWASM/TestHostPrerenderWASM.Client/wwwroot/appsettings.json
177193
178-
194+
195+
- name: Create docs directory
196+
run: mkdir -p docs
197+
198+
179199

180200
# Print the contents of appsettings.json inside 'TestHostPrerenderWASM.Client' folder
181201
# - name: Display appsettings.json content

0 commit comments

Comments
 (0)