Skip to content

Commit 7163147

Browse files
committed
added check for unzip
moved switch to src from doc to script added Set-ExecutionPolicy to prerequisites added Unblock-File added unzip and subversion to Linux prerequisites
1 parent 4559fde commit 7163147

File tree

2 files changed

+24
-5
lines changed

2 files changed

+24
-5
lines changed

scripts/verify-release.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
#!/bin/bash
22
set -e
33

4+
if ! which unzip >/dev/null 2>&1; then
5+
echo "The 'unzip' utility is required, but was not found in your path" >&2
6+
exit 1
7+
fi
8+
49
TARGET_DIR="$1";
510
if test -z "$TARGET_DIR"; then
611
TARGET_DIR="$(pwd)"
@@ -17,3 +22,5 @@ done
1722
mkdir -p src
1823
cd src
1924
unzip -q -o ../*source*.zip
25+
26+
cd src

src/site/antora/modules/ROOT/pages/release-review.adoc

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ Releases of log4net can be verified with following steps:
2626
+
2727
[source,powershell]
2828
----
29-
$releaseVersion = ...VerionToValidate...
29+
# as administrator
30+
Set-ExecutionPolicy -ExecutionPolicy RemoteSigned
3031
winget install -e --id GnuPG.Gpg4win
3132
winget install -e --id Slik.Subversion # or any other subversion client
3233
winget install -e --id Mono.Mono
@@ -49,6 +50,7 @@ choco install dotnet-8.0-sdk
4950
+
5051
[source,powershell]
5152
----
53+
$releaseVersion = ...VersionToValidate...
5254
svn co https://dist.apache.org/repos/dist/dev/logging/log4net/${releaseVersion} log4net-${releaseVersion}
5355
pushd log4net-${releaseVersion}
5456
----
@@ -57,6 +59,7 @@ pushd log4net-${releaseVersion}
5759
+
5860
[source,powershell]
5961
----
62+
Unblock-File ./verify-release.ps1
6063
& ./verify-release.ps1
6164
----
6265
@@ -72,6 +75,14 @@ dotnet test ./src/log4net.sln
7275
[#linux]
7376
== Linux
7477
78+
. Prerequisites
79+
+
80+
[source,bash]
81+
----
82+
sudo apt install unzip -y
83+
sudo apt install subversion -y
84+
----
85+
7586
. Check out the release distribution:
7687
+
7788
[source,bash]
@@ -100,7 +111,6 @@ wget --cut-dirs=6 \
100111
[source,bash]
101112
----
102113
bash ./verify-release.sh
103-
cd src
104114
----
105115
+
106116
[%collapsible]
@@ -131,8 +141,10 @@ for sigFile in *.asc; do gpg --verify $sigFile ${sigFile%.asc}; done
131141
+
132142
[source,bash]
133143
----
134-
umask 0022
135-
unzip -q *source*.zip -d src
144+
mkdir -p src
145+
cd src
146+
unzip -q -o ../*source*.zip
147+
136148
cd src
137149
----
138150
====
@@ -148,4 +160,4 @@ docker run -it log4net-builder
148160
# - build src/log4net.sln
149161
# inside the container run
150162
dotnet test /logging-log4net/src/log4net.sln
151-
----
163+
----

0 commit comments

Comments
 (0)