Skip to content

Commit 2f2caed

Browse files
author
Andy C
committed
[release] Shell functions for Oils 0.35.0
Also revert the Alpine chroot version back to 3.11. The oils-ref tarball doesn't build in 3.22 for some reason, possibly due to C99 strictness.
1 parent 70838d0 commit 2f2caed

File tree

4 files changed

+24
-8
lines changed

4 files changed

+24
-8
lines changed

build/doc.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@
2525
source $LIB_OSH/bash-strict.sh
2626
source $LIB_OSH/task-five.sh
2727

28-
readonly OILS_VERSION=$(head -n 1 oils-version.txt)
28+
OILS_VERSION=$(head -n 1 oils-version.txt)
29+
readonly OILS_VERSION
2930
export OILS_VERSION # for quick_ref.py
3031

3132
THIS_DIR=$(readlink -f $(dirname $0))
@@ -667,7 +668,6 @@ run-code-in-doc() {
667668
;;
668669
esac
669670

670-
set -x
671671
split-and-render doc/$name.md '' $web_url
672672

673673
local work_dir=$REPO_ROOT/_tmp/$name

deps/from-binary.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ extract-clang() {
4545
# TODO: retire ../oil_DEPS dir in favor of wedge
4646
mkdir -p $DEPS_DIR
4747
pushd $DEPS_DIR
48-
time tar -x --xz < ../oil/_cache/clang+llvm-$LLVM_VERSION*.tar.xz
48+
time tar -x --xz < ../oils/_cache/clang+llvm-$LLVM_VERSION*.tar.xz
4949
popd
5050
}
5151

devtools/release-version.sh

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -676,6 +676,11 @@ git-changelog-0.34.0() {
676676
> _release/VERSION/changelog.html
677677
}
678678

679+
git-changelog-0.35.0() {
680+
_git-changelog origin/release/0.34.0 release/0.35.0 \
681+
> _release/VERSION/changelog.html
682+
}
683+
679684
# For announcement.html
680685
html-redirect() {
681686
local url=$1
@@ -1140,6 +1145,10 @@ announcement-0.34.0() {
11401145
write-no-announcement
11411146
}
11421147

1148+
announcement-0.35.0() {
1149+
write-no-announcement
1150+
}
1151+
11431152
blog-redirect() {
11441153
html-redirect 'making-plans.html' > $SITE_DEPLOY_DIR/blog/2020/01/11.html
11451154
}

test/alpine.sh

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@
7070
source $LIB_OSH/bash-strict.sh
7171
source $LIB_OSH/task-five.sh
7272

73-
#readonly ROOTFS_URL='http://dl-cdn.alpinelinux.org/alpine/v3.11/releases/x86_64/alpine-minirootfs-3.11.3-x86_64.tar.gz'
74-
readonly ROOTFS_URL='https://dl-cdn.alpinelinux.org/alpine/v3.22/releases/x86_64/alpine-minirootfs-3.22.1-x86_64.tar.gz'
73+
readonly ROOTFS_URL='http://dl-cdn.alpinelinux.org/alpine/v3.11/releases/x86_64/alpine-minirootfs-3.11.3-x86_64.tar.gz'
74+
#readonly ROOTFS_URL='https://dl-cdn.alpinelinux.org/alpine/v3.22/releases/x86_64/alpine-minirootfs-3.22.1-x86_64.tar.gz'
7575

7676
readonly CHROOT_OILS_TAR=_chroot/alpine-oils-tar
7777
readonly CHROOT_OILS_SPEC=_chroot/alpine-oils-spec
@@ -92,9 +92,16 @@ _extract() {
9292

9393
du --si -s $dest
9494
}
95-
extract-oils-tar() { sudo $0 _extract $CHROOT_OILS_TAR; }
96-
extract-oils-spec() { sudo $0 _extract $CHROOT_OILS_SPEC; }
97-
extract-distro-build() { sudo $0 _extract $CHROOT_DISTRO_BUILD; }
95+
96+
extract-oils-tar() {
97+
mkdir -p _chroot # should not be owned by root
98+
sudo $0 _extract $CHROOT_OILS_TAR
99+
}
100+
101+
extract-oils-spec() {
102+
mkdir -p _chroot # should not be owned by root
103+
sudo $0 _extract $CHROOT_OILS_SPEC;
104+
}
98105

99106
# Without this, you can't 'su myusername'. It won't be able to execute bash.
100107
chmod-chroot() {

0 commit comments

Comments
 (0)