Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Asciidoctor to OpenXR "pregen" image, sync images, and refresh #43

Merged
merged 3 commits into from
Jan 16, 2025
Merged

Add Asciidoctor to OpenXR "pregen" image, sync images, and refresh #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eb88f5c
Add asciidoctor (just the debian package) to openxr-sdk.
rpavlik Sep 17, 2024
2c68fb3
Sync the OpenXR SDK and pregen SDK image packages
rpavlik Sep 17, 2024
67a9f4f
Refresh all OpenXR images.
rpavlik Sep 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions build-all.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ set -e
./build-one.sh vulkan-docs-base 202206 "$@"
./build-one.sh vulkan-docs 202206 "$@"
./build-one.sh rust 202312 "$@"
./build-one.sh openxr 20240412 "$@"
./build-one.sh openxr-sdk 20240412 "$@"
./build-one.sh openxr-pregenerated-sdk 20240412 "$@"
./build-one.sh openxr-android 20240412 "$@"
./build-one.sh openxr 20240924 "$@"
./build-one.sh openxr-sdk 20240924 "$@"
./build-one.sh openxr-pregenerated-sdk 20240924 "$@"
./build-one.sh openxr-android 20240924 "$@"
)
8 changes: 7 additions & 1 deletion openxr-pregenerated-sdk.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,11 @@ RUN env DEBIAN_FRONTEND=noninteractive apt-get update -qq && \
wget \
gcc-multilib \
g++-multilib \
linux-libc-dev:i386 \
libelf-dev:i386 \
libgl1-mesa-dev:i386 \
libvulkan-dev:i386 \
libwayland-dev:i386 \
libx11-dev:i386 \
libx11-xcb-dev:i386 \
libxcb-dri2-0-dev:i386 \
libxcb-glx0-dev:i386 \
Expand All @@ -66,6 +68,10 @@ RUN env DEBIAN_FRONTEND=noninteractive apt-get update -qq && \
libxcb-randr0-dev:i386 \
libxrandr-dev:i386 \
libxxf86vm-dev:i386 \
linux-libc-dev:i386 \
mesa-common-dev:i386 \
&& env DEBIAN_FRONTEND=noninteractive apt-get clean \
&& rm -rf /var/lib/apt/lists/*

# Copy in the toolchain file
COPY i386.cmake /i386.cmake
4 changes: 3 additions & 1 deletion openxr-sdk.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ RUN dpkg --add-architecture i386
# Runtime-required packages
RUN env DEBIAN_FRONTEND=noninteractive apt-get update -qq && \
env DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y -qq \
asciidoctor \
apt-transport-https \
build-essential \
ca-certificates \
Expand Down Expand Up @@ -89,7 +90,8 @@ RUN env DEBIAN_FRONTEND=noninteractive apt-get update -qq && \
libxxf86vm-dev:i386 \
linux-libc-dev:i386 \
mesa-common-dev:i386 \
&& apt-get clean
&& env DEBIAN_FRONTEND=noninteractive apt-get clean \
&& rm -rf /var/lib/apt/lists/*

# Copy in the toolchain file
COPY i386.cmake /i386.cmake
Loading