Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix SvnDist.yml #92

Merged
merged 4 commits into from
Jan 31, 2024
Merged

Fix SvnDist.yml #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8d7f810
Fix download of junit jar
Jan 31, 2024
5ff0c4e
Update actions because of Node.js deprecation
Jan 31, 2024
f0d0bce
Only run copy if="${javaHome != '' and buildJavaHL}"
Jan 31, 2024
652a929
Update wix projects to openssl3.x and remove duplicate nuget ref
Jan 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/SvnDist.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,16 @@ jobs:

steps:
- name: Git Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup Java
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: 'adopt'
java-version: '8'

- name: Cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
imports/downloads
Expand All @@ -37,7 +37,7 @@ jobs:
run: ${{env.nant}} -f:tools/buildbot.build "-D:CCNetNumericLabel=${{ github.run_number }}" "-D:CCNetProject=SlikSvn" -D:svnDist=true -D:gitBuild=true buildbot-build package-svndist

- name: Upload artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: svndist-files
path: |
Expand Down
13 changes: 4 additions & 9 deletions imports/scripts/download.build
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" ?>
<project basedir=".." default="build">

<property name="junitFilename" value="junit${junitVersion}.zip" />
<property name="junitFilename" value="junit-${junitVersion}.jar" />
<property name="junitDir" value="${buildRoot}\junit${junitVersion}" />
<property name="junitJar" value="${junitDir}\junit-${junitVersion}.jar" />
<property name="junitJar" value="${buildRoot}\junit-${junitVersion}.jar" />

<property name="cmakeFilename" value="cmake-${cmakeVersion}-windows-i386.zip" />
<property name="cmakeDir" value="build/cmake-${cmakeVersion}-windows-i386" />
Expand Down Expand Up @@ -64,7 +64,7 @@
</if>

<get
src="https://prdownloads.sourceforge.net/junit/junit/${junitVersion}/${junitFilename}"
src="https://repo1.maven.org/maven2/junit/junit/${junitVersion}/${junitFilename}"
dest="${downloads + junitFilename}"
unless="${file::exists(downloads + junitFilename)}"
if="${javaHome != '' and buildJavaHL}" />
Expand Down Expand Up @@ -127,11 +127,6 @@
todir="${gettextToolsDir}"
encoding="utf-8" />
</if>
<unzip
zipfile="${downloads + junitFilename}"
todir="build"
encoding="utf-8"
unless="${directory::exists(junitDir)}"
if="${javaHome != '' and buildJavaHL}" />
<copy file="${downloads + junitFilename}" tofile="${junitJar}" unless="${file::exists(junitJar)}" if="${javaHome != '' and buildJavaHL}" />/>
</target>
</project>
4 changes: 2 additions & 2 deletions imports/svn-dist/Wix/P_ARM64.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@
<File Id="libaprutil_1.dll" Name="SlikSvn-libaprutil-1.dll" KeyPath="yes" Checksum="yes" />
</Component>
<Component Id="libcrypto.dll" Guid="B9E59868-28DD-4FA4-A8DB-9110F53DE69F">
<File Id="libcrypto.dll" Name="SlikSvn-libcrypto-1_1-ARM64.dll" KeyPath="yes" Checksum="yes" />
<File Id="libcrypto.dll" Name="SlikSvn-libcrypto-3-ARM64.dll" KeyPath="yes" Checksum="yes" />
</Component>
<Directory Id="INSTALLLOCATION_BIN_engines" Name="engines" FileSource="$(var.distDir)\bin\engines\">
<Component Id="Capi.dll" Guid="CE19BB13-0872-4A8A-B510-018248E5D8C7">
Expand All @@ -116,7 +116,7 @@
<File Id="libsasl21.dll" Name="SlikSvn-libsasl21.dll" KeyPath="yes" Checksum="yes" />
</Component>
<Component Id="libssl.dll" Guid="14534E6A-7BB7-407A-9E3B-2C73463EC2CE">
<File Id="libssl.dll" Name="SlikSvn-libssl-1_1-ARM64.dll" KeyPath="yes" Checksum="yes" />
<File Id="libssl.dll" Name="SlikSvn-libssl-3-ARM64.dll" KeyPath="yes" Checksum="yes" />
</Component>
<Component Id="libintl.dll" Guid="E63D5D3A-09B2-4A0F-A4A4-10919DC6A4D2">
<File Id="libintl.dll" Name="SlikSvn-libintl.dll" KeyPath="yes" Checksum="yes" />
Expand Down
4 changes: 2 additions & 2 deletions imports/svn-dist/Wix/P_Win32.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@
<File Id="libaprutil_1.dll" Name="SlikSvn-libaprutil-1.dll" KeyPath="yes" Checksum="yes" />
</Component>
<Component Id="libcrypto.dll" Guid="E4FCB2C7-37EB-4D26-81D1-EBBDFC3BC254">
<File Id="libcrypto.dll" Name="SlikSvn-libcrypto-1_1.dll" KeyPath="yes" Checksum="yes" />
<File Id="libcrypto.dll" Name="SlikSvn-libcrypto-3.dll" KeyPath="yes" Checksum="yes" />
</Component>
<Directory Id="INSTALLLOCATION_BIN_engines" Name="engines" FileSource="$(var.distDir)\bin\engines">
<Component Id="Capi.dll" Guid="7D63AE46-7922-4CCF-8D19-5000EEDDE446">
Expand All @@ -116,7 +116,7 @@
<File Id="libsasl21.dll" Name="SlikSvn-libsasl21.dll" KeyPath="yes" Checksum="yes" />
</Component>
<Component Id="libssl.dll" Guid="4FEF731C-79EA-4D51-BEB6-6CCBDC29616C">
<File Id="libssl.dll" Name="SlikSvn-libssl-1_1.dll" KeyPath="yes" Checksum="yes" />
<File Id="libssl.dll" Name="SlikSvn-libssl-3.dll" KeyPath="yes" Checksum="yes" />
</Component>
<Component Id="libintl.dll" Guid="F4CDB29C-7A57-4DBD-9679-A998EFD33D78">
<File Id="libintl.dll" Name="SlikSvn-libintl.dll" KeyPath="yes" Checksum="yes" />
Expand Down
4 changes: 2 additions & 2 deletions imports/svn-dist/Wix/P_X64.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@
<File Id="libaprutil_1.dll" Name="SlikSvn-libaprutil-1.dll" KeyPath="yes" Checksum="yes" />
</Component>
<Component Id="libcrypto.dll" Guid="E5ACB7F7-9CAC-4FA3-9DE2-297F42182D78">
<File Id="libcrypto.dll" Name="SlikSvn-libcrypto-1_1-x64.dll" KeyPath="yes" Checksum="yes" />
<File Id="libcrypto.dll" Name="SlikSvn-libcrypto-3-x64.dll" KeyPath="yes" Checksum="yes" />
</Component>
<Directory Id="INSTALLLOCATION_BIN_engines" Name="engines" FileSource="$(var.distDir)\bin\engines\">
<Component Id="Capi.dll" Guid="937F455B-CA31-4350-A7D6-2B24A2A41F42">
Expand All @@ -116,7 +116,7 @@
<File Id="libsasl21.dll" Name="SlikSvn-libsasl21.dll" KeyPath="yes" Checksum="yes" />
</Component>
<Component Id="libssl.dll" Guid="B90ADB2A-FBDF-4CD0-879C-EF40AAA6D280">
<File Id="libssl.dll" Name="SlikSvn-libssl-1_1-x64.dll" KeyPath="yes" Checksum="yes" />
<File Id="libssl.dll" Name="SlikSvn-libssl-3-x64.dll" KeyPath="yes" Checksum="yes" />
</Component>
<Component Id="libintl.dll" Guid="81D9F23F-760A-4E65-A327-A8EF2B6EBE55">
<File Id="libintl.dll" Name="SlikSvn-libintl.dll" KeyPath="yes" Checksum="yes" />
Expand Down
7 changes: 2 additions & 5 deletions imports/svn-dist/Wix/SlikSvn.wixproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="WixToolset.Sdk/4.0.0-rc.1">
<Project Sdk="WixToolset.Sdk/4.0.3">
<PropertyGroup>
<UpgradeCode>38BD67A1-0135-414F-82ED-3BF0F30C87AA</UpgradeCode>
</PropertyGroup>
Expand Down Expand Up @@ -60,15 +60,12 @@
<OutputName>Slik-Subversion-$(SvnFullVersion)-ARM64</OutputName>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="WixToolset.UI.wixext" Version="4.0.0-rc.1" />
<PackageReference Include="WixToolset.UI.wixext" Version="4.0.3" />
</ItemGroup>
<ItemGroup>
<Content Include="SlikSvnLicense.rtf" />
<Compile Include="../Release/Licenses/SharpSvn-Licenses-v4.wxs">
<Link>SharpSvn-Licenses-v4.wxs</Link>
</Compile>
</ItemGroup>
<ItemGroup>
<PackageReference Include="WixToolset.UI.wixext" />
</ItemGroup>
</Project>
Loading