prehistoric-systems/FilterLists
1
0
Fork 0
mirror of https://github.com/collinbarrett/FilterLists.git synced 2026-03-11 09:04:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/master' into ant4

Browse source 
# Conflicts:
#	web/package-lock.json
This commit is contained in:
Collin M. Barrett 2020-03-15 15:29:38 -05:00
commit dc6021dd00
3 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
server/azure-pipelines.migrate.yaml
View file

@ -24,8 +24,7 @@ steps:
targetType: inline
script: |
FORKURI=$(curl -X GET "https://api.github.com/repos/$BUILD_REPOSITORY_NAME/pulls/$SYSTEM_PULLREQUEST_PULLREQUESTNUMBER" | jq -r '.head.repo.clone_url')
git clone "$FORKURI" .
git checkout "$SYSTEM_PULLREQUEST_SOURCEBRANCH"
git clone --single-branch -b "$SYSTEM_PULLREQUEST_SOURCEBRANCH" "$FORKURI" .
- task: Bash@3
displayName: abort if just migrated

2
server/src/FilterLists.Agent/FilterLists.Agent.csproj
View file

@ -46,7 +46,7 @@
<PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.2" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="3.1.2" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.9.10" />
<PackageReference Include="Octokit" Version="0.43.0" />
<PackageReference Include="Octokit" Version="0.44.0" />
<PackageReference Include="Polly" Version="7.2.0" />
<PackageReference Include="RestSharp" Version="106.10.1" />
<PackageReference Include="Serilog.Extensions.Logging" Version="3.0.1" />

BIN
web/package-lock.json generated
View file

Binary file not shown.