Skip to content

Commit 0c12eec

Browse files
authored
Merge branch 'rgl:master' into minimal_build
2 parents f0e23d6 + 7f21258 commit 0c12eec

4 files changed

Lines changed: 16 additions & 13 deletions

File tree

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ This builds Windows 11/2022/2025 base Vagrant boxes using [Packer](https://www.p
33

44
# Usage
55

6-
Install a supported hypervisor (e.g. [libvirt](https://libvirt.org/)), [packer 1.10+](https://www.packer.io/) and [vagrant](https://www.vagrantup.com/).
6+
Install a supported hypervisor (e.g. [libvirt](https://libvirt.org/)), [packer 1.14+](https://www.packer.io/) and [vagrant](https://www.vagrantup.com/).
77
If you are using Windows and [Chocolatey](https://chocolatey.org/), you can install the tools (you still need to install Hyper-V) from an administrative PowerShell session with:
88

99
```powershell
10-
choco install -y packer vagrant msys2
10+
choco install -y packer vagrant msys2 jq
1111
1212
# configure the msys2 launcher to let the shell inherit the PATH.
1313
$msys2BasePath = 'C:\tools\msys64'

provision-drivers.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ f="$(basename "$u")"
1010
if [ ! -f "drivers/$f" ]; then
1111
rm -rf drivers drivers.tmp
1212
mkdir -p drivers.tmp
13-
wget -P drivers.tmp "$u"
13+
wget --progress=dot:giga -P drivers.tmp "$u"
1414
7z x -odrivers.tmp drivers.tmp/virtio-win-*.iso
1515
mv drivers.tmp drivers
1616
fi

provision-openssh.ps1

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,12 @@ function Install-ZippedApplication($destinationPath, $name, $url, $expectedHash,
4646
function Install-Rsync {
4747
# see https://github.com/rgl/rsync-vagrant/releases
4848
# renovate: datasource=github-releases depName=rgl/rsync-vagrant
49-
$version = '3.4.1-20251027'
49+
$version = '3.4.1-20260111'
5050
Install-ZippedApplication `
5151
$rsyncHome `
5252
rsync `
5353
"https://github.com/rgl/rsync-vagrant/releases/download/v$version/rsync-vagrant-$version.zip" `
54-
a87400277cbb76dc1b36c0cf807ee00a77a46224a4462cd1c8734c4113532d40
54+
bb09eab2e5ea061b9a8d31e16017f910687c2b71af552a5c0a3cb607691e8287
5555
[Environment]::SetEnvironmentVariable(
5656
'PATH',
5757
"$([Environment]::GetEnvironmentVariable('PATH', 'Machine'));$rsyncHome",
@@ -61,12 +61,12 @@ function Install-Rsync {
6161
function Install-OpenSshBinaries {
6262
# see https://github.com/PowerShell/Win32-OpenSSH/releases
6363
# renovate: datasource=github-releases depName=PowerShell/Win32-OpenSSH
64-
$version = '9.8.3.0p2-Preview'
64+
$version = '10.0.0.0p2-Preview'
6565
Install-ZippedApplication `
6666
$openSshHome `
6767
OpenSSH `
68-
"https://github.com/PowerShell/Win32-OpenSSH/releases/download/v$version/OpenSSH-Win64.zip" `
69-
0ca131f3a78f404dc819a6336606caec0db1663a692ccc3af1e90232706ada54
68+
"https://github.com/PowerShell/Win32-OpenSSH/releases/download/$version/OpenSSH-Win64.zip" `
69+
23f50f3458c4c5d0b12217c6a5ddfde0137210a30fa870e98b29827f7b43aba5
7070
Push-Location $openSshHome
7171
Move-Item OpenSSH-Win64\* .
7272
Remove-Item OpenSSH-Win64
@@ -96,7 +96,7 @@ if (Test-Path $openSshConfigHome) {
9696
# NB sshd, at startup, if it does not already exists (as its the case of this
9797
# initial installation), will copy this file to
9898
# $openSshConfigHome\sshd_config.
99-
# see https://github.com/PowerShell/openssh-portable/blob/v9.8.3.0/contrib/win32/win32compat/wmain_sshd.c#L152-L156
99+
# see https://github.com/PowerShell/openssh-portable/blob/v10.0.0.0/contrib/win32/win32compat/wmain_sshd.c#L152-L156
100100
$sshdConfig = Get-Content -Raw "$openSshHome\sshd_config_default"
101101
# Configure the Administrators group to also use the ~/.ssh/authorized_keys file.
102102
# see https://github.com/PowerShell/Win32-OpenSSH/issues/1324

renovate.sh

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ gitea_container_name="$(basename "$(dirname "$(realpath "${BASH_SOURCE[0]}")")")
1313

1414
# see https://hub.docker.com/r/gitea/gitea/tags
1515
# renovate: datasource=docker depName=gitea/gitea
16-
gitea_version='1.24.7'
16+
gitea_version='1.25.3'
1717

1818
# see https://hub.docker.com/r/renovate/renovate/tags
1919
# see https://github.com/renovatebot/renovate/releases
2020
# renovate: datasource=docker depName=renovate/renovate
21-
renovate_version='41.159.3'
21+
renovate_version='42.76.5'
2222

2323
# clean.
2424
echo 'Deleting existing Gitea...'
@@ -30,7 +30,7 @@ install -d tmp
3030
# start gitea in background.
3131
# see https://docs.gitea.io/en-us/config-cheat-sheet/
3232
# see https://github.com/go-gitea/gitea/releases
33-
# see https://github.com/go-gitea/gitea/blob/v1.24.7/docker/root/etc/s6/gitea/setup
33+
# see https://github.com/go-gitea/gitea/blob/v1.25.3/docker/root/etc/s6/gitea/setup
3434
echo 'Starting Gitea...'
3535
docker run \
3636
--detach \
@@ -172,7 +172,10 @@ docker run \
172172
"renovate/renovate:$renovate_version" \
173173
--platform=gitea \
174174
--git-url=endpoint \
175-
>tmp/renovate-log.json
175+
>tmp/renovate-log.txt
176+
grep -E '^{' \
177+
tmp/renovate-log.txt \
178+
>tmp/renovate-log.json
176179

177180
echo 'Getting results...'
178181
# extract the errors.

0 commit comments

Comments
 (0)