Skip to content

Commit

Permalink
Merge pull request #172 from bgilbert/bin
Browse files Browse the repository at this point in the history
Rename repository to `openslide-bin`
  • Loading branch information
bgilbert authored Nov 1, 2023
2 parents 00f7034 + 42608c0 commit 6354eca
Show file tree
Hide file tree
Showing 10 changed files with 25 additions and 25 deletions.
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/release.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# openslide-winbuild release process
# openslide-bin release process

- [ ] Update software versions, submit PR
- [ ] Land PR
- [ ] Create and push signed tag
- [ ] Verify that CI creates a [GitHub release](https://github.com/openslide/openslide-winbuild/releases/) with artifacts
- [ ] Verify that CI creates a [GitHub release](https://github.com/openslide/openslide-bin/releases/) with artifacts
- [ ] Update website: `_data/releases.yaml`, maybe `_includes/news.md`
- [ ] Possibly send mail to -announce and -users
- [ ] Update `WINBUILD_RELEASE` in [OpenSlide Python CI](https://github.com/openslide/openslide-python/blob/main/.github/workflows/python.yml)
16 changes: 8 additions & 8 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,13 @@ on:
description: Override OpenSlide Java with this openslide_java_repo ref
required: false
type: string
openslide_winbuild_repo:
description: Use openslide-winbuild from this repo
openslide_bin_repo:
description: Use openslide-bin from this repo
required: false
type: string
default: openslide/openslide-winbuild
openslide_winbuild_ref:
description: Use openslide-winbuild from this ref
default: openslide/openslide-bin
openslide_bin_ref:
description: Use openslide-bin from this ref
required: false
type: string
default: main
Expand Down Expand Up @@ -78,8 +78,8 @@ jobs:
- name: Check out repo
uses: actions/checkout@v4
with:
repository: ${{ inputs.openslide_winbuild_repo }}
ref: ${{ inputs.openslide_winbuild_ref }}
repository: ${{ inputs.openslide_bin_repo }}
ref: ${{ inputs.openslide_bin_ref }}

- name: Check out OpenSlide
if: inputs.openslide_repo != ''
Expand Down Expand Up @@ -110,7 +110,7 @@ jobs:
- name: Cache sources
uses: actions/cache@v3
with:
key: winbuild-tar
key: build-packagecache
path: meson/subprojects/packagecache
- name: Build source zip
run: ./build.sh -p "${{ inputs.pkgver }}" sdist
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Build stable releases on push to openslide-winbuild main.
# Build stable releases on push to openslide-bin main.
# Nightly builds from Git are handled elsewhere.

name: Build main
Expand Down Expand Up @@ -42,7 +42,7 @@ jobs:
with:
linux_builder_repo_and_digest: ${{ needs.setup.outputs.linux_builder_repo_and_digest }}
macos_enable: true
openslide_winbuild_repo: ${{ github.repository }}
openslide_winbuild_ref: ${{ github.ref }}
openslide_bin_repo: ${{ github.repository }}
openslide_bin_ref: ${{ github.ref }}
pkgver: ${{ needs.setup.outputs.pkgver }}
windows_builder_repo_and_digest: ${{ needs.setup.outputs.windows_builder_repo_and_digest }}
10 changes: 5 additions & 5 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# PR CI workflow for openslide-winbuild
# PR CI workflow for openslide-bin

name: Build

Expand Down Expand Up @@ -41,8 +41,8 @@ jobs:
with:
linux_builder_repo_and_digest: ${{ needs.setup.outputs.linux_builder_repo_and_digest }}
macos_enable: true
openslide_winbuild_repo: ${{ github.repository }}
openslide_winbuild_ref: ${{ github.ref }}
openslide_bin_repo: ${{ github.repository }}
openslide_bin_ref: ${{ github.ref }}
pkgver: ${{ needs.setup.outputs.pkgver }}-stable
windows_builder_repo_and_digest: ${{ needs.setup.outputs.windows_builder_repo_and_digest }}

Expand All @@ -57,8 +57,8 @@ jobs:
openslide_ref: main
openslide_java_repo: openslide/openslide-java
openslide_java_ref: main
openslide_winbuild_repo: ${{ github.repository }}
openslide_winbuild_ref: ${{ github.ref }}
openslide_bin_repo: ${{ github.repository }}
openslide_bin_ref: ${{ github.ref }}
pkgver: ${{ needs.setup.outputs.pkgver }}-git
werror: true
windows_builder_repo_and_digest: ${{ needs.setup.outputs.windows_builder_repo_and_digest }}
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ jobs:
with:
linux_builder_repo_and_digest: ${{ needs.setup.outputs.linux_builder_repo_and_digest }}
macos_enable: true
openslide_winbuild_repo: ${{ github.repository }}
openslide_winbuild_ref: ${{ github.ref }}
openslide_bin_repo: ${{ github.repository }}
openslide_bin_ref: ${{ github.ref }}
pkgver: ${{ needs.setup.outputs.pkgver }}
windows_builder_repo_and_digest: ${{ needs.setup.outputs.windows_builder_repo_and_digest }}

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# openslide-winbuild
# openslide-bin

This is a set of scripts for building OpenSlide for Windows, including all
of its dependencies, using MinGW-w64.
Expand Down
2 changes: 1 addition & 1 deletion build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ tag_cachedir() {
mkdir -p "$1"
cat > "$1/CACHEDIR.TAG" <<EOF
Signature: 8a477f597d28d172789f06886806bc55
# This file is a cache directory tag created by openslide-winbuild.
# This file is a cache directory tag created by openslide-bin.
# For information about cache directory tags, see https://bford.info/cachedir/
EOF
fi
Expand Down
2 changes: 1 addition & 1 deletion meson/include/setjmp.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* pointer to skip the SEH unwind. Our uses of setjmp/longjmp are all in
* libpng/libjpeg error handling, which isn't expecting to do any cleanup
* in intermediate stack frames, so this should be fine.
* https://github.com/openslide/openslide-winbuild/issues/47
* https://github.com/openslide/openslide-bin/issues/47
*/
#if defined _WIN32
#undef setjmp
Expand Down
2 changes: 1 addition & 1 deletion meson/meson.build
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
project(
'openslide-winbuild',
'openslide-bin',
'c',
license : 'LGPL-2.1-only',
meson_version : '>=0.64',
Expand Down
2 changes: 1 addition & 1 deletion meson/subprojects/packagecache/CACHEDIR.TAG
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Signature: 8a477f597d28d172789f06886806bc55
# This file is a cache directory tag committed to the openslide-winbuild repo.
# This file is a cache directory tag committed to the openslide-bin repo.
# For information about cache directory tags, see https://bford.info/cachedir/

0 comments on commit 6354eca

Please sign in to comment.