diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7e405e9..fd1b4e6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -48,9 +48,9 @@ jobs: id: params run: | set -euo pipefail - suffix="$(date +%Y%m%d)-nightly" + suffix="$(date +%Y%m%d).nightly" echo "suffix=$suffix" >> $GITHUB_OUTPUT - duplicate=$(jq ".builds[] | select(.version | endswith(\"$suffix\"))" \ + duplicate=$(jq ".builds[] | select(.version | endswith(\"+$suffix\"))" \ docs/index.json) if [ -n "$duplicate" ]; then echo "Found existing nightly build with suffix $suffix" @@ -105,7 +105,7 @@ jobs: openslide_java_ref: ${{ needs.setup.outputs.java_commit }} openslide_bin_repo: openslide/openslide-bin openslide_bin_ref: ${{ needs.setup.outputs.bin_commit }} - pkgver: ${{ needs.setup.outputs.suffix }} + suffix: ${{ needs.setup.outputs.suffix }} upload: name: Upload @@ -128,7 +128,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | scripts/make-index.py \ - --version "${{ needs.setup.outputs.suffix }}" \ + --version "${{ needs.build.outputs.version }}" \ --files "${{ needs.build.outputs.artifact }}" \ --linux-builder "${{ needs.setup.outputs.linux_builder_repo_and_digest }}" \ --windows-builder "${{ needs.setup.outputs.windows_builder_repo_and_digest }}" \ @@ -140,10 +140,10 @@ jobs: GITHUB_TOKEN: ${{ github.token }} run: | artifact="${{ needs.build.outputs.artifact }}" - version="${{ needs.setup.outputs.suffix }}" + version="${{ needs.build.outputs.version }}" - unzip -j "${artifact}/openslide-win64-${version}.zip" \ - "openslide-win64-${version}/VERSIONS.md" + unzip -j "${artifact}/openslide-bin-${version}-windows-x64.zip" \ + "openslide-bin-${version}-windows-x64/VERSIONS.md" # trim width for commit message limit sed -i -e 's/ |$/|/' VERSIONS.md pkglen=$(awk -F'|' '{print length($2) - 2; exit}' VERSIONS.md) diff --git a/docs/index.html b/docs/index.html index 6a2fb7b..7995c2d 100644 --- a/docs/index.html +++ b/docs/index.html @@ -103,6 +103,9 @@

OpenSlide development builds

+ + + @@ -117,6 +120,9 @@

OpenSlide development builds

+ + + @@ -167,6 +173,9 @@

OpenSlide development builds

+ + + @@ -181,6 +190,9 @@

OpenSlide development builds

+ + + @@ -231,6 +243,9 @@

OpenSlide development builds

+ + + @@ -245,6 +260,9 @@

OpenSlide development builds

+ + + @@ -293,6 +311,9 @@

OpenSlide development builds

+ + + @@ -307,6 +328,9 @@

OpenSlide development builds

+ + + @@ -357,6 +381,9 @@

OpenSlide development builds

+ + + @@ -371,6 +398,9 @@

OpenSlide development builds

+ + + @@ -421,6 +451,9 @@

OpenSlide development builds

+ + + @@ -435,6 +468,9 @@

OpenSlide development builds

+ + + @@ -487,6 +523,9 @@

OpenSlide development builds

+ + + @@ -501,6 +540,9 @@

OpenSlide development builds

+ + + @@ -551,6 +593,9 @@

OpenSlide development builds

+ + + @@ -565,6 +610,9 @@

OpenSlide development builds

+ + + @@ -617,6 +665,9 @@

OpenSlide development builds

+ + + @@ -631,6 +682,9 @@

OpenSlide development builds

+ + + @@ -681,6 +735,9 @@

OpenSlide development builds

+ + + @@ -695,6 +752,9 @@

OpenSlide development builds

+ + + @@ -745,6 +805,9 @@

OpenSlide development builds

+ + + @@ -759,6 +822,9 @@

OpenSlide development builds

+ + + @@ -809,6 +875,9 @@

OpenSlide development builds

+ + + @@ -823,6 +892,9 @@

OpenSlide development builds

+ + + @@ -873,6 +945,9 @@

OpenSlide development builds

+ + + @@ -887,6 +962,9 @@

OpenSlide development builds

+ + + @@ -937,6 +1015,9 @@

OpenSlide development builds

+ + + @@ -951,6 +1032,9 @@

OpenSlide development builds

+ + + @@ -1001,6 +1085,9 @@

OpenSlide development builds

+ + + @@ -1015,6 +1102,9 @@

OpenSlide development builds

+ + + @@ -1069,6 +1159,9 @@

OpenSlide development builds

+ + + @@ -1083,6 +1176,9 @@

OpenSlide development builds

+ + + @@ -1135,6 +1231,9 @@

OpenSlide development builds

+ + + @@ -1149,6 +1248,9 @@

OpenSlide development builds

+ + + @@ -1201,6 +1303,9 @@

OpenSlide development builds

+ + + @@ -1215,6 +1320,9 @@

OpenSlide development builds

+ + + @@ -1269,6 +1377,9 @@

OpenSlide development builds

+ + + @@ -1283,6 +1394,9 @@

OpenSlide development builds

+ + + @@ -1333,6 +1447,9 @@

OpenSlide development builds

+ + + @@ -1347,6 +1464,9 @@

OpenSlide development builds

+ + + @@ -1399,6 +1519,9 @@

OpenSlide development builds

+ + + @@ -1417,6 +1540,9 @@

OpenSlide development builds

+ + + @@ -1467,6 +1593,9 @@

OpenSlide development builds

+ + + @@ -1485,6 +1614,9 @@

OpenSlide development builds

+ + + @@ -1537,6 +1669,9 @@

OpenSlide development builds

+ + + @@ -1555,6 +1690,9 @@

OpenSlide development builds

+ + + @@ -1605,6 +1743,9 @@

OpenSlide development builds

+ + + @@ -1623,6 +1764,9 @@

OpenSlide development builds

+ + + @@ -1673,6 +1817,9 @@

OpenSlide development builds

+ + + @@ -1691,6 +1838,9 @@

OpenSlide development builds

+ + + @@ -1741,6 +1891,9 @@

OpenSlide development builds

+ + + @@ -1759,6 +1912,9 @@

OpenSlide development builds

+ + + @@ -1809,6 +1965,9 @@

OpenSlide development builds

+ + + @@ -1827,6 +1986,9 @@

OpenSlide development builds

+ + + @@ -1877,6 +2039,9 @@

OpenSlide development builds

+ + + @@ -1895,6 +2060,9 @@

OpenSlide development builds

+ + + @@ -1947,6 +2115,9 @@

OpenSlide development builds

+ + + @@ -1965,6 +2136,9 @@

OpenSlide development builds

+ + + @@ -2013,6 +2187,9 @@

OpenSlide development builds

+ + + @@ -2031,6 +2208,9 @@

OpenSlide development builds

+ + + diff --git a/docs/index.json b/docs/index.json index 6bf2b75..39ebcdb 100644 --- a/docs/index.json +++ b/docs/index.json @@ -431,5 +431,5 @@ "windows-builder": "ghcr.io/openslide/winbuild-builder@sha256:9ee8747971640303e75745249d1a81a0dd75d5d7fcace4b5da095d0d58a91da1" } ], - "last_update": 1701826848 + "last_update": 1701939999 } diff --git a/scripts/make-index.py b/scripts/make-index.py index 91ccd2d..a59d773 100755 --- a/scripts/make-index.py +++ b/scripts/make-index.py @@ -137,12 +137,14 @@ {{ artifact_link(row, 'winbuild', 'winbuild', '.zip', 'Source') }} + {{ artifact_link(row, 'source', 'bin', '.tar.gz', 'Source') }} {{ artifact_link(row, 'win32', 'win32', '.zip', 'Windows x86') }} {{ artifact_link(row, 'win64', 'win64', '.zip', 'Windows x64') }} + {{ artifact_link(row, 'windows-x64', 'bin', '-windows-x64.zip', 'Windows x64') }} {% endfor %} @@ -191,12 +193,14 @@ def main(): parser.error('New build must be completely specified') records.append({ 'version': args.version, - 'date': dateutil.parser.parse(args.version.split('-')[0]). - date().isoformat(), + 'date': dateutil.parser.parse( + args.version.split('+')[1].split('.')[0] + ).date().isoformat(), 'tag': 'v' + args.version, 'files': sorted( - path.name.split(f'-{args.version}')[0]. - removeprefix('openslide-').removeprefix('bin-') + 'source' + if path.name.endswith(f'{args.version}.tar.gz') + else path.name.split(f'{args.version}-')[1].split('.')[0] for path in args.files.iterdir() ), 'linux-builder': args.linux_builder,