Skip to content
This repository was archived by the owner on Jun 30, 2023. It is now read-only.

Commit 1012955

Browse files
kzukzu
authored
Bump files with dotnet-file sync
# devlooped/oss - Don't collect logs anymore devlooped/oss@6bd81a3 - Don't run build when changing docs devlooped/oss@db76fb9 - 🔨 Populate RepositoryBranch in CI w/MSBuild devlooped/oss@55c0b32 - Don't fail the build if sleet finds no packages to push devlooped/oss@6928fc7 - Allow manually running builds devlooped/oss@fc5889d - Use full name as Author, since Owner is already kzu devlooped/oss@0fc6e0e - Only include/pack icon.png if it exists in the default location devlooped/oss@ae442c0 - Preserve transitively copied content in VS devlooped/oss@52d6c40 - Allow manually running changelog and dotnet-file workflows devlooped/oss@084aa7c - Automatically label dotnet-file bump and auto-delete branch devlooped/oss@eeaeb55
1 parent d3a00b2 commit 1012955

File tree

8 files changed

+67
-119
lines changed

8 files changed

+67
-119
lines changed

‎.github/workflows/build.yml‎

Lines changed: 8 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@ on:
66
workflow_dispatch:
77
push:
88
branches: [ main, dev, 'feature/*', 'rel/*' ]
9+
paths-ignore:
10+
- changelog.md
11+
- code-of-conduct.md
12+
- security.md
13+
- support.md
914
pull_request:
1015
types: [opened, synchronize, reopened]
1116

@@ -47,20 +52,14 @@ jobs:
4752
fetch-depth: 0
4853

4954
- name: 🙏 build
50-
run: dotnet build -m:1 -bl:build.binlog -p:VersionLabel="$GITHUB_REF.$GITHUB_RUN_NUMBER" -p:RepositoryBranch=${GITHUB_REF#refs/*/}
55+
run: dotnet build -m:1 -p:VersionLabel="$GITHUB_REF.$GITHUB_RUN_NUMBER"
5156

5257
- name: 🧪 test
53-
run: dotnet test --no-build -m:1 --blame-hang --blame-hang-timeout 5m -d $GITHUB_WORKSPACE/logs/${{ matrix.os }}.txt -r $GITHUB_WORKSPACE/logs
58+
run: dotnet test --no-build -m:1 --blame-hang --blame-hang-timeout 5m
5459

5560
- name: 📦 pack
56-
run: dotnet pack -m:1 -bl:pack.binlog -p:VersionLabel="$GITHUB_REF.$GITHUB_RUN_NUMBER" -p:RepositoryBranch=${GITHUB_REF#refs/*/}
61+
run: dotnet pack -m:1 -p:VersionLabel="$GITHUB_REF.$GITHUB_RUN_NUMBER"
5762

58-
- name: 🔼 packages
59-
uses: actions/upload-artifact@v2
60-
with:
61-
name: bin
62-
path: bin/*.nupkg
63-
6463
# Only push CI package to sleet feed if building on ubuntu (fastest)
6564
- name: 🚀 sleet
6665
env:
@@ -69,80 +68,3 @@ jobs:
6968
run: |
7069
dotnet tool install -g --version 4.0.18 sleet
7170
sleet push bin --config none -f --verbose -p "SLEET_FEED_CONTAINER=nuget" -p "SLEET_FEED_CONNECTIONSTRING=${{ secrets.SLEET_CONNECTION }}" -p "SLEET_FEED_TYPE=azure" || echo "No packages found"
72-
73-
acceptance:
74-
name: acceptance-${{ matrix.os }}
75-
runs-on: ${{ matrix.os }}
76-
needs: build
77-
strategy:
78-
matrix:
79-
os: [ubuntu-latest, windows-latest, macOS-latest]
80-
steps:
81-
- name: 🤘 checkout
82-
uses: actions/checkout@v2
83-
84-
- name: 🔽 packages
85-
uses: actions/download-artifact@v2
86-
with:
87-
name: bin
88-
path: bin
89-
90-
- name: 🧪 test
91-
run: dotnet test -p:VersionLabel="$GITHUB_REF.$GITHUB_RUN_NUMBER"
92-
working-directory: src/Acceptance
93-
94-
preview:
95-
defaults:
96-
run:
97-
shell: pwsh
98-
needs: dotnet-format
99-
runs-on: windows-latest
100-
101-
steps:
102-
- name: 🤘 checkout
103-
uses: actions/checkout@v2
104-
105-
# > VS Preview
106-
- name: 🔽 dotnet-vs
107-
run: dotnet tool update -g dotnet-vs
108-
- name: 🔽 vs preview
109-
run: vs install preview --quiet +Microsoft.VisualStudio.Component.ManagedDesktop.Core +Microsoft.NetCore.Component.DevelopmentTools
110-
- name: ≥ msbuild
111-
run: echo "$(vs where preview --prop=InstallationPath)\MSBuild\Current\Bin" >> $env:GITHUB_PATH
112-
# < VS Preview
113-
114-
- name: ⚙ curl
115-
run: |
116-
iwr -useb get.scoop.sh | iex
117-
scoop install curl
118-
- name: 🔍 status for PR
119-
if: ${{ github.event.pull_request.head.sha }}
120-
run: echo "STATUS_SHA=${{ github.event.pull_request.head.sha }}" >> $env:GITHUB_ENV
121-
122-
- name: 🔍 status for branch
123-
if: ${{ !github.event.pull_request.head.sha }}
124-
run: echo "STATUS_SHA=$($env:GITHUB_SHA)" >> $env:GITHUB_ENV
125-
126-
- name: ⌛ wait on build
127-
env:
128-
CHECK: build-windows-latest
129-
SHA: ${{ env.STATUS_SHA }}
130-
TOKEN: ${{ secrets.GITHUB_TOKEN }}
131-
run: ./.github/workflows/wait-status.ps1
132-
133-
- name: ⌛ wait on acceptance
134-
env:
135-
CHECK: acceptance-windows-latest
136-
SHA: ${{ env.STATUS_SHA }}
137-
TOKEN: ${{ secrets.GITHUB_TOKEN }}
138-
run: ./.github/workflows/wait-status.ps1
139-
140-
- name: 🔽 packages
141-
uses: actions/download-artifact@v2
142-
with:
143-
name: bin
144-
path: bin
145-
146-
- name: 🧪 test
147-
run: msbuild -r -t:build,test -p:TargetFramework=net472 -p:VersionLabel="$($env:GITHUB_REF).$($env:GITHUB_RUN_NUMBER)"
148-
working-directory: src/Acceptance

‎.github/workflows/changelog.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
on:
33
release:
44
types: [released]
5+
workflow_dispatch:
56

67
env:
78
GH_TOKEN: ${{ secrets.GH_TOKEN }}

‎.github/workflows/dotnet-file.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Synchronizes .netconfig-configured files with dotnet-file
22
name: dotnet-file
33
on:
4+
workflow_dispatch:
45
schedule:
56
- cron: "0 0 * * *"
67
push:
@@ -50,6 +51,8 @@ jobs:
5051
with:
5152
base: main
5253
branch: dotnet-file-sync
54+
delete-branch: true
55+
labels: dependencies
5356
commit-message: Bump files with dotnet-file sync
5457

5558
${{ env.CHANGES }}

‎.github/workflows/publish.yml‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,13 @@ jobs:
2222
fetch-depth: 0
2323

2424
- name: 🙏 build
25-
run: dotnet build -m:1 -bl:build.binlog -p:version=${GITHUB_REF#refs/*/v} -p:RepositoryBranch=${GITHUB_REF#refs/*/}
25+
run: dotnet build -m:1 -p:version=${GITHUB_REF#refs/*/v}
2626

2727
- name: 🧪 test
2828
run: dotnet test --no-build -m:1
2929

3030
- name: 📦 pack
31-
run: dotnet pack -m:1 -bl:pack.binlog -p:version=${GITHUB_REF#refs/*/v} -p:RepositoryBranch=${GITHUB_REF#refs/*/}
32-
33-
- name: 🔼 logs
34-
if: ${{ always() }}
35-
uses: actions/upload-artifact@v2
36-
with:
37-
path: '**/*.binlog'
31+
run: dotnet pack -m:1 -p:version=${GITHUB_REF#refs/*/v}
3832

3933
- name: 🚀 nuget
4034
run: dotnet nuget push ./bin/**/*.nupkg -s https://api.nuget.org/v3/index.json -k ${{secrets.NUGET_API_KEY}} --skip-duplicate

‎.github/workflows/release-artifacts.yml‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,13 @@ jobs:
2020
run: echo "CURRENT_TAG=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
2121

2222
- name: 🙏 build
23-
run: dotnet build -m:1 -bl:build.binlog -p:version=${GITHUB_REF#refs/*/v} -p:RepositoryBranch=${GITHUB_REF#refs/*/}
23+
run: dotnet build -m:1 -p:version=${GITHUB_REF#refs/*/v}
2424

2525
- name: 🧪 test
2626
run: dotnet test --no-build -m:1
2727

2828
- name: 📦 pack
29-
run: dotnet pack -m:1 -bl:pack.binlog -p:version=${GITHUB_REF#refs/*/v} -p:RepositoryBranch=${GITHUB_REF#refs/*/}
30-
31-
- name: 🔼 logs
32-
if: ${{ always() }}
33-
uses: actions/upload-artifact@v2
34-
with:
35-
path: '**/*.binlog'
29+
run: dotnet pack -m:1 -p:version=${GITHUB_REF#refs/*/v}
3630

3731
- name: 🔽 gh
3832
run: |

‎.netconfig‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@
5252

5353
[file ".github/workflows/build.yml"]
5454
url = https://github.com/devlooped/oss/blob/main/.github/workflows/build.yml
55-
sha = 4bc9de2ce63f083c2805752a25c5997ebc102aeb
56-
etag = 16edbc0d7121c2527f0e62d441bbb4ac2b1ffc7e25ccd4b3d0611c0c86716520
55+
sha = fc5889d5387e2d5aa7aba279b2aa12251cf08cb2
56+
etag = 91e9a208cd134bd7b71d7419800c613bc50a30e21e605607528721f2acdeab86
5757
weak
5858

5959
[file ".github_changelog_generator"]
@@ -100,14 +100,14 @@
100100

101101
[file "src/Directory.Build.props"]
102102
url = https://github.com/devlooped/oss/blob/main/src/Directory.Build.props
103-
sha = c9924b558ddeafb2cb547a7fcbc18aa7ae292ad1
104-
etag = dc86d6818b98a7426c604039a07e134d61c8c598f1ceedb9e0e481fa0f93385d
103+
sha = 52d6c40aaa460ac48fc74c03324c6b1db7ae170d
104+
etag = ae2606c157b9725ce8c707e30d9768fb0bad901ac34065d3cd75fc2bdbc5f8cf
105105
weak
106106

107107
[file "src/Directory.Build.targets"]
108108
url = https://github.com/devlooped/oss/blob/main/src/Directory.Build.targets
109-
sha = e7de4d0e790f9fe58f31308f95886884b6c5805f
110-
etag = 9956aef0f3becce22fc1dc4e68dd218d5ba3c23de2b106c4ad006ad321cacc4a
109+
sha = 55c0b32601e94e1eed35028a0cad510c6bcbb265
110+
etag = 874f20853c983e6440ed67bb571d94927f9fb4cd4438585b07df7b420c664609
111111
weak
112112

113113
[file "src/kzu.snk"]
@@ -166,20 +166,20 @@
166166

167167
[file ".github/workflows/changelog.yml"]
168168
url = https://github.com/devlooped/oss/blob/main/.github/workflows/changelog.yml
169-
sha = 169dfb51e7fa3f05cbfe01ca0342c0729f69b481
170-
etag = 2478e00a02849f0a65287d44028eb3c9f99ee0c0529cddaa88088765abc5da0b
169+
sha = 084aa7c36ee1c262ea2f9e83931068366a7b4312
170+
etag = 1e17c477f9e26f83367870a18e3727a71dcbb49cd31d85e0cfcfe092202d3a66
171171
weak
172172

173173
[file ".github/workflows/publish.yml"]
174174
url = https://github.com/devlooped/oss/blob/main/.github/workflows/publish.yml
175-
sha = e68624389d8133571da53e83ab4e88de7bc028a8
176-
etag = 8067230717247263ad661c69780fdfdf4b6f140287517fee9c5d4e64d4b737af
175+
sha = 55c0b32601e94e1eed35028a0cad510c6bcbb265
176+
etag = ad8681ee3f191f796944135772b74565c470e349464e793aa664c888f7784b7a
177177
weak
178178

179179
[file ".github/workflows/release-artifacts.yml"]
180180
url = https://github.com/devlooped/oss/blob/main/.github/workflows/release-artifacts.yml
181-
sha = e68624389d8133571da53e83ab4e88de7bc028a8
182-
etag = 8be10a2fbeb9e6924d8b08e58a61a0f69138352c6f5477b53dcd34c26d8d35ef
181+
sha = 55c0b32601e94e1eed35028a0cad510c6bcbb265
182+
etag = 53f2dd2465fd15a065828468139544449ab7ccc0ba40f9074d7ac92426bfd07b
183183
weak
184184

185185
[file ".github/workflows/release-notes.yml"]
@@ -190,6 +190,6 @@
190190

191191
[file ".github/workflows/dotnet-file.yml"]
192192
url = https://github.com/devlooped/oss/blob/main/.github/workflows/dotnet-file.yml
193-
sha = 094043587f7e7313a0a77dece1532fbcb1ce8555
194-
etag = 15333d15756257ec2d7975ea3ba5a22d1e3fae98aab35d83d67a728628e90cea
193+
sha = 084aa7c36ee1c262ea2f9e83931068366a7b4312
194+
etag = 501f8bf58287fdd7467701342f7251a015bc29664b494e7d81a71c0c55bee61f
195195
weak

‎src/Directory.Build.props‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919
</PropertyGroup>
2020

2121
<PropertyGroup Label="NuGet">
22-
<Authors>kzu</Authors>
22+
<Authors>Daniel Cazzulino</Authors>
2323
<Copyright>Copyright (C) Daniel Cazzulino and Contributors. All rights reserved.</Copyright>
2424
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
2525
<PackageLicenseExpression>MIT</PackageLicenseExpression>
26-
<PackageIcon>icon.png</PackageIcon>
26+
<PackageIcon Condition="Exists('$(MSBuildThisFileDirectory)icon.png')">icon.png</PackageIcon>
2727

2828
<PublishRepositoryUrl>true</PublishRepositoryUrl>
2929
<GenerateRepositoryUrlAttribute>true</GenerateRepositoryUrlAttribute>
@@ -41,7 +41,8 @@
4141
<None Include="$(MSBuildThisFileDirectory)icon.png" Link="icon.png"
4242
Pack="true"
4343
Visible="false"
44-
PackagePath="%(Filename)%(Extension)" />
44+
PackagePath="%(Filename)%(Extension)"
45+
Condition="Exists('$(MSBuildThisFileDirectory)icon.png')" />
4546
</ItemGroup>
4647

4748
<PropertyGroup Label="Build">
@@ -78,6 +79,9 @@
7879
<NoWarn>NU5105;$(NoWarn)</NoWarn>
7980
<!-- Turn warnings into errors in CI or Release builds -->
8081
<WarningsAsErrors Condition="$(CI) or '$(Configuration)' == 'Release'">true</WarningsAsErrors>
82+
83+
<!-- Preserve transitively copied content in VS: https://github.com/dotnet/msbuild/issues/1054#issuecomment-847959047 -->
84+
<MSBuildCopyContentTransitively>true</MSBuildCopyContentTransitively>
8185
</PropertyGroup>
8286

8387
<PropertyGroup Label="StrongName" Condition="Exists('$(MSBuildThisFileDirectory)kzu.snk')">

‎src/Directory.Build.targets‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,36 @@
3737
<OutDir>$(OutputPath)</OutDir>
3838
</PropertyGroup>
3939

40+
<PropertyGroup Condition="'$(RepositoryBranch)' == ''">
41+
<!-- GitHub Actions: https://docs.github.com/en/actions/reference/environment-variables#default-environment-variables -->
42+
<RepositoryBranch Condition="'$(RepositoryBranch)' == '' and '$(GITHUB_REF)' != '' and $(GITHUB_REF.Contains('refs/pull/'))">pr$(GITHUB_REF.Replace('refs/pull/', '').Replace('/merge', ''))</RepositoryBranch>
43+
<RepositoryBranch Condition="'$(RepositoryBranch)' == '' and '$(GITHUB_REF)' != ''">$(GITHUB_REF.Replace('refs/heads/', '').Replace('refs/tags/', ''))</RepositoryBranch>
44+
<!-- Azure DevOps: https://docs.microsoft.com/en-us/azure/devops/pipelines/build/variables -->
45+
<RepositoryBranch Condition="'$(RepositoryBranch)' == '' and '$(BUILD_SOURCEBRANCH)' != ''">$(BUILD_SOURCEBRANCH.Replace('refs/heads/', '').Replace('refs/tags/', ''))</RepositoryBranch>
46+
<!-- AppVeyor: https://www.appveyor.com/docs/environment-variables/ -->
47+
<RepositoryBranch Condition="'$(RepositoryBranch)' == '' and '$(APPVEYOR_PULL_REQUEST_NUMBER)' != ''">pr$(APPVEYOR_PULL_REQUEST_NUMBER)</RepositoryBranch>
48+
<RepositoryBranch Condition="'$(RepositoryBranch)' == '' and '$(APPVEYOR_REPO_TAG_NAME)' != ''">$(APPVEYOR_REPO_TAG_NAME)</RepositoryBranch>
49+
<RepositoryBranch Condition="'$(RepositoryBranch)' == '' and '$(APPVEYOR_REPO_BRANCH)' != ''">$(APPVEYOR_REPO_BRANCH)</RepositoryBranch>
50+
<!-- TeamCity: https://www.jetbrains.com/help/teamcity/predefined-build-parameters.html#Branch-Related+Parameters -->
51+
<RepositoryBranch Condition="'$(RepositoryBranch)' == '' and '$(TEAMCITY_BUILD_BRANCH)' != ''">$(TEAMCITY_BUILD_BRANCH)</RepositoryBranch>
52+
<!--TravisCI: https://docs.travis-ci.com/user/environment-variables/ -->
53+
<RepositoryBranch Condition="'$(RepositoryBranch)' == '' and '$(TRAVIS_PULL_REQUEST)' != '' and '$(TRAVIS_PULL_REQUEST)' != 'false'">pr$(TRAVIS_PULL_REQUEST)</RepositoryBranch>
54+
<RepositoryBranch Condition="'$(RepositoryBranch)' == '' and '$(TRAVIS_BRANCH)' != ''">$(TRAVIS_BRANCH)</RepositoryBranch>
55+
<!-- CircleCI: https://circleci.com/docs/2.0/env-vars/ -->
56+
<RepositoryBranch Condition="'$(RepositoryBranch)' == '' and '$(CIRCLE_PR_NUMBER)' != ''">pr$(CIRCLE_PR_NUMBER)</RepositoryBranch>
57+
<RepositoryBranch Condition="'$(RepositoryBranch)' == '' and '$(CIRCLE_TAG)' != ''">$(CIRCLE_TAG)</RepositoryBranch>
58+
<RepositoryBranch Condition="'$(RepositoryBranch)' == '' and '$(CIRCLE_BRANCH)' != ''">$(CIRCLE_BRANCH)</RepositoryBranch>
59+
<!-- GitLab: https://docs.gitlab.com/ee/ci/variables/predefined_variables.html -->
60+
<RepositoryBranch Condition="'$(RepositoryBranch)' == '' and '$(CI_COMMIT_TAG)' != ''">$(CI_COMMIT_TAG)</RepositoryBranch>
61+
<RepositoryBranch Condition="'$(RepositoryBranch)' == '' and '$(CI_MERGE_REQUEST_IID)' != ''">pr$(CI_MERGE_REQUEST_IID)</RepositoryBranch>
62+
<RepositoryBranch Condition="'$(RepositoryBranch)' == '' and '$(CI_EXTERNAL_PULL_REQUEST_IID)' != ''">pr$(CI_EXTERNAL_PULL_REQUEST_IID)</RepositoryBranch>
63+
<RepositoryBranch Condition="'$(RepositoryBranch)' == '' and '$(CI_COMMIT_BRANCH)' != ''">$(CI_COMMIT_BRANCH)</RepositoryBranch>
64+
<!-- Buddy: https://buddy.works/docs/pipelines/environment-variables#default-environment-variables -->
65+
<RepositoryBranch Condition="'$(RepositoryBranch)' == '' and '$(BUDDY_EXECUTION_PULL_REQUEST_NO)' != ''">pr$(BUDDY_EXECUTION_PULL_REQUEST_NO)</RepositoryBranch>
66+
<RepositoryBranch Condition="'$(RepositoryBranch)' == '' and '$(BUDDY_EXECUTION_TAG)' != ''">$(BUDDY_EXECUTION_TAG)</RepositoryBranch>
67+
<RepositoryBranch Condition="'$(RepositoryBranch)' == '' and '$(BUDDY_EXECUTION_BRANCH)' != ''">$(BUDDY_EXECUTION_BRANCH)</RepositoryBranch>
68+
</PropertyGroup>
69+
4070
<ItemGroup>
4171
<!-- Consider the project out of date if any of these files changes -->
4272
<UpToDateCheck Include="@(PackageFile);@(None);@(Content);@(EmbeddedResource)" />

0 commit comments

Comments
 (0)