Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
@andrewrk
andrewrk committed Sep 12, 2024
2 parents 167ac7d + db37148 commit 99aecab
Show file tree
Hide file tree
Showing 12 changed files with 469 additions and 97 deletions.
47 changes: 47 additions & 0 deletions .github/workflows/build-tarballs.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,39 @@ echo | minisign -Sm zig-windows-aarch64-$ZIG_VERSION.zip
echo | minisign -Sm zig-windows-x86-$ZIG_VERSION.zip
#echo | minisign -Sm zig-freebsd-x86_64-$ZIG_VERSION.tar.xz

# Delete builds older than 30 days so the server does not run out of disk space.
WWW_PREFIX="/var/www/html"
find $WWW_PREFIX/* -ctime +30 -exec rm -rf {} \;
mkdir -p "$WWW_PREFIX/builds"

cp zig-$ZIG_VERSION.tar.xz "$WWW_PREFIX/builds/"
cp zig-bootstrap-$ZIG_VERSION.tar.xz "$WWW_PREFIX/builds/"
cp zig-linux-x86_64-$ZIG_VERSION.tar.xz "$WWW_PREFIX/builds/"
cp zig-macos-x86_64-$ZIG_VERSION.tar.xz "$WWW_PREFIX/builds/"
cp zig-linux-aarch64-$ZIG_VERSION.tar.xz "$WWW_PREFIX/builds/"
cp zig-macos-aarch64-$ZIG_VERSION.tar.xz "$WWW_PREFIX/builds/"
cp zig-linux-x86-$ZIG_VERSION.tar.xz "$WWW_PREFIX/builds/"
cp zig-linux-armv7a-$ZIG_VERSION.tar.xz "$WWW_PREFIX/builds/"
cp zig-linux-riscv64-$ZIG_VERSION.tar.xz "$WWW_PREFIX/builds/"
cp zig-linux-powerpc64le-$ZIG_VERSION.tar.xz "$WWW_PREFIX/builds/"
cp zig-windows-x86_64-$ZIG_VERSION.zip "$WWW_PREFIX/builds/"
cp zig-windows-aarch64-$ZIG_VERSION.zip "$WWW_PREFIX/builds/"
cp zig-windows-x86-$ZIG_VERSION.zip "$WWW_PREFIX/builds/"
cp zig-$ZIG_VERSION.tar.xz.minisig "$WWW_PREFIX/builds/"
cp zig-bootstrap-$ZIG_VERSION.tar.xz.minisig "$WWW_PREFIX/builds/"
cp zig-linux-x86_64-$ZIG_VERSION.tar.xz.minisig "$WWW_PREFIX/builds/"
cp zig-macos-x86_64-$ZIG_VERSION.tar.xz.minisig "$WWW_PREFIX/builds/"
cp zig-linux-aarch64-$ZIG_VERSION.tar.xz.minisig "$WWW_PREFIX/builds/"
cp zig-macos-aarch64-$ZIG_VERSION.tar.xz.minisig "$WWW_PREFIX/builds/"
cp zig-linux-x86-$ZIG_VERSION.tar.xz.minisig "$WWW_PREFIX/builds/"
cp zig-linux-armv7a-$ZIG_VERSION.tar.xz.minisig "$WWW_PREFIX/builds/"
cp zig-linux-riscv64-$ZIG_VERSION.tar.xz.minisig "$WWW_PREFIX/builds/"
cp zig-linux-powerpc64le-$ZIG_VERSION.tar.xz.minisig "$WWW_PREFIX/builds/"
cp zig-windows-x86_64-$ZIG_VERSION.zip.minisig "$WWW_PREFIX/builds/"
cp zig-windows-aarch64-$ZIG_VERSION.zip.minisig "$WWW_PREFIX/builds/"
cp zig-windows-x86-$ZIG_VERSION.zip.minisig "$WWW_PREFIX/builds/"


s3cmd put -P --add-header="cache-control: public, max-age=31536000, immutable" zig-$ZIG_VERSION.tar.xz s3://ziglang.org/builds/
s3cmd put -P --add-header="cache-control: public, max-age=31536000, immutable" zig-bootstrap-$ZIG_VERSION.tar.xz s3://ziglang.org/builds/

Expand Down Expand Up @@ -276,6 +309,8 @@ s3cmd put -P \
out/index.json.minisig \
s3://ziglang.org/builds/zig-$ZIG_VERSION-index.json.minisig

cp out/index.json.minisig "$WWW_PREFIX/builds/zig-$ZIG_VERSION-index.json.minisig"

mv out/index.json "$WEBSITEDIR/assets/download/index.json"
cd "$WEBSITEDIR"

Expand All @@ -294,6 +329,9 @@ s3cmd put -P --no-mime-magic \
--add-header="Cache-Control: max-age=0, must-revalidate" \
"$DOCDIR/langref.html" s3://ziglang.org/documentation/master/index.html

mkdir -p "$WWW_PREFIX/documentation/master"
cp "$DOCDIR/langref.html" "$WWW_PREFIX/documentation/master/index.html"

# Standard library autodocs are intentionally excluded from tarballs of Zig but
# we want to host them on the website.
"$ZIG" build-obj -fno-emit-bin -femit-docs="$DOCDIR/std" "$BOOTSTRAP_SRC/zig/lib/std/std.zig"
Expand Down Expand Up @@ -329,3 +367,12 @@ s3cmd put -P --no-mime-magic \
--add-header="Content-Encoding: gzip" \
--add-header="Cache-Control: max-age=0, must-revalidate" \
"$DOCDIR/std/sources.tar.gz" s3://ziglang.org/documentation/master/std/sources.tar


mkdir -p "$WWW_PREFIX/documentation/master/std"
cp "$DOCDIR/std/index.html.gz" "$WWW_PREFIX/documentation/master/std/index.html.gz"
cp "$DOCDIR/std/main.js.gz" "$WWW_PREFIX/documentation/master/std/main.js.gz"
cp "$DOCDIR/std/main.wasm.gz" "$WWW_PREFIX/documentation/master/std/main.wasm.gz"
cp "$DOCDIR/std/sources.tar.gz" "$WWW_PREFIX/documentation/master/std/sources.tar.gz"


2 changes: 1 addition & 1 deletion .github/workflows/build-tarballs.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,4 @@ jobs:
env:
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
run: ./.github/workflows/build-tarballs.sh
run: nice -10 ./.github/workflows/build-tarballs.sh
82 changes: 41 additions & 41 deletions assets/download/index.json
View file
Original file line number Diff line number Diff line change
@@ -1,73 +1,73 @@
{
"master": {
"version": "0.14.0-dev.855+de1fb1990",
"date": "2024-08-07",
"version": "0.14.0-dev.1550+4fba7336a",
"date": "2024-09-12",
"docs": "https://ziglang.org/documentation/master/",
"stdDocs": "https://ziglang.org/documentation/master/std/",
"src": {
"tarball": "https://ziglang.org/builds/zig-0.14.0-dev.855+de1fb1990.tar.xz",
"shasum": "f273b970321fa5280cb7b4989804b093a032ce2f46e1a6f3c8a5920c817caf9e",
"size": "17326684"
"tarball": "https://ziglang.org/builds/zig-0.14.0-dev.1550+4fba7336a.tar.xz",
"shasum": "f59b7f4f38a52f9c4269d44ba460c04ed7dfc4e25aab4559df5a8c2b4c6ed4a1",
"size": "17532416"
},
"bootstrap": {
"tarball": "https://ziglang.org/builds/zig-bootstrap-0.14.0-dev.855+de1fb1990.tar.xz",
"shasum": "611e70e1206be8ffbdee45db79b8f5e7034daf6cdecc8fbbb7347c4d9c088492",
"size": "46563408"
"tarball": "https://ziglang.org/builds/zig-bootstrap-0.14.0-dev.1550+4fba7336a.tar.xz",
"shasum": "ad7b03154608a8f5aae9fb1717fabdd3177a51f1df4f7e95ede8ca3feb96d1c6",
"size": "46769080"
},
"x86_64-macos": {
"tarball": "https://ziglang.org/builds/zig-macos-x86_64-0.14.0-dev.855+de1fb1990.tar.xz",
"shasum": "075a4870fe84dc47ce3c92823c42711d16ee45f79cadb8fda50fb45459d43d7c",
"size": "49047856"
"tarball": "https://ziglang.org/builds/zig-macos-x86_64-0.14.0-dev.1550+4fba7336a.tar.xz",
"shasum": "0fdc669f840d1190c32785ff75f7622db59664631cb723ecbe8ab9adcf4531ad",
"size": "49528692"
},
"aarch64-macos": {
"tarball": "https://ziglang.org/builds/zig-macos-aarch64-0.14.0-dev.855+de1fb1990.tar.xz",
"shasum": "6b5fe194e6489a74d7aa397ccf4936ea1134a6fb844a0920361e22f1325f2524",
"size": "45083548"
"tarball": "https://ziglang.org/builds/zig-macos-aarch64-0.14.0-dev.1550+4fba7336a.tar.xz",
"shasum": "950bc76d527e95c912aa5bbc8dfe1d2b9a9f84beb877e7ba7b3025bedd4c506e",
"size": "45500116"
},
"x86_64-linux": {
"tarball": "https://ziglang.org/builds/zig-linux-x86_64-0.14.0-dev.855+de1fb1990.tar.xz",
"shasum": "b999617a845be425d103a909b0f00e0f9905d93840219f8ecb79a9811c631618",
"size": "47266480"
"tarball": "https://ziglang.org/builds/zig-linux-x86_64-0.14.0-dev.1550+4fba7336a.tar.xz",
"shasum": "a23648ee3b436e1631c60f11a07276dd1717a39572ab46c826518798685ae138",
"size": "47739456"
},
"aarch64-linux": {
"tarball": "https://ziglang.org/builds/zig-linux-aarch64-0.14.0-dev.855+de1fb1990.tar.xz",
"shasum": "32ede10d331e236994c17e9fcd5963316f85ecdeb9a799a72234862c44bff4d1",
"size": "43279780"
"tarball": "https://ziglang.org/builds/zig-linux-aarch64-0.14.0-dev.1550+4fba7336a.tar.xz",
"shasum": "cc9b15ea333ab728d49108eb14860829c10940c3837d714cb7642b0485638b26",
"size": "43687236"
},
"armv7a-linux": {
"tarball": "https://ziglang.org/builds/zig-linux-armv7a-0.14.0-dev.855+de1fb1990.tar.xz",
"shasum": "9280a36f1bb3ab83d7e9a4cd2dd673d5c24ce0ad948868aa9a781a66ac218783",
"size": "44191232"
"tarball": "https://ziglang.org/builds/zig-linux-armv7a-0.14.0-dev.1550+4fba7336a.tar.xz",
"shasum": "6f868950be3b2df11ef72c7be84f7bbc7fae247bcc75e969156046d1aa14ee56",
"size": "44638952"
},
"riscv64-linux": {
"tarball": "https://ziglang.org/builds/zig-linux-riscv64-0.14.0-dev.855+de1fb1990.tar.xz",
"shasum": "351d0f08ecd2acd0c4fc936e115ab621cfcc29faf859a54041b0dbaaabd905de",
"size": "45738740"
"tarball": "https://ziglang.org/builds/zig-linux-riscv64-0.14.0-dev.1550+4fba7336a.tar.xz",
"shasum": "016d7440ced748a9a993116e2a0dd363c5b6abd4ab9c87df451eb6abd518e5a9",
"size": "46222404"
},
"powerpc64le-linux": {
"tarball": "https://ziglang.org/builds/zig-linux-powerpc64le-0.14.0-dev.855+de1fb1990.tar.xz",
"shasum": "15f13395a20801d75908e908546e14c95150688d997749d549928e2a7c2ab167",
"size": "46737452"
"tarball": "https://ziglang.org/builds/zig-linux-powerpc64le-0.14.0-dev.1550+4fba7336a.tar.xz",
"shasum": "647d69aef4874bf24921aacd3004d0fdfef31d6590ae8d38b3955b778166fe96",
"size": "47180368"
},
"x86-linux": {
"tarball": "https://ziglang.org/builds/zig-linux-x86-0.14.0-dev.855+de1fb1990.tar.xz",
"shasum": "2b9d256bec3e25a9e3c0c77c565fc1fbd1fca9dd137c2ad8ebfc5770b52a4853",
"size": "52248564"
"tarball": "https://ziglang.org/builds/zig-linux-x86-0.14.0-dev.1550+4fba7336a.tar.xz",
"shasum": "56a9fa5fcbbf6c763a088a9329fe669f09a83c8f6cd05c22808a1ff6faac1463",
"size": "52713908"
},
"x86_64-windows": {
"tarball": "https://ziglang.org/builds/zig-windows-x86_64-0.14.0-dev.855+de1fb1990.zip",
"shasum": "599e4ba7bf05775edaa998c740a8c136954f55cfb759973b264caf2ceff5b794",
"size": "80025925"
"tarball": "https://ziglang.org/builds/zig-windows-x86_64-0.14.0-dev.1550+4fba7336a.zip",
"shasum": "0f22368c8b348a92c3b393ea5c3883eb2b8d9927978d53f1b31c2a9de1da7656",
"size": "80843129"
},
"aarch64-windows": {
"tarball": "https://ziglang.org/builds/zig-windows-aarch64-0.14.0-dev.855+de1fb1990.zip",
"shasum": "430c765e1ee40dd0ee886bf1745df1602609be16798bb1b848e6ae94e04c7331",
"size": "75953487"
"tarball": "https://ziglang.org/builds/zig-windows-aarch64-0.14.0-dev.1550+4fba7336a.zip",
"shasum": "1e66678d214cc3263fcfb56ae40278d4353668572231e0ccbeeba9bc31e51262",
"size": "76733350"
},
"x86-windows": {
"tarball": "https://ziglang.org/builds/zig-windows-x86-0.14.0-dev.855+de1fb1990.zip",
"shasum": "2d99810e5cc83f9361a9e060cc0baf4513731cf8d4c5ddd79bc6277f052d8b0b",
"size": "84060434"
"tarball": "https://ziglang.org/builds/zig-windows-x86-0.14.0-dev.1550+4fba7336a.zip",
"shasum": "127757292c745eff3ff9da8631d34192ea6bc791ebb1fde75bb858639cfb0f4b",
"size": "85065361"
}
},
"0.13.0": {
Expand Down
Binary file modified assets/favicon.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions assets/github-sponsors-release-notes.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,12 +84,12 @@
<li>Jeff Fowler</li>
<li>Nate</li>
<li>Christian Gibson</li>
<li>impactaky</li>
<li>Kohei Nozaki</li>
<li>Dylan Conway</li>
<li>Hlib Kanunnikov</li>
<li>merkleplant</li>
<li>Omar AlSuwaidi</li>
<li>Duncan Marsh</li>
<li>Nikolay G.</li>
<li>Roast Beef Kazenzakis</li>
<li>Willian Hasse</li>
<li>Datomata</li>
Binary file modified assets/sponsors/dropbox.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/sponsors/lavatech.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/sponsors/scaleway.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/sponsors/tb-logo-black.png
100755 → 100644
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/sponsors/tb-logo-white.png
100755 → 100644
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 99aecab

Please sign in to comment.