Skip to content

Commit

Permalink
Rename to .oci
Browse files Browse the repository at this point in the history
  • Loading branch information
dmnks committed Oct 27, 2023
1 parent eca90a6 commit 553af1a
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 15 deletions.
8 changes: 4 additions & 4 deletions tests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -68,18 +68,18 @@ if (nproc GREATER 1)
endif()

# Set up mktree
set(MKTREE_BACKEND podman CACHE STRING "Mktree backend to use")
set(MKTREE_BACKEND oci CACHE STRING "Mktree backend to use")
set(DOCKERFILE ${CMAKE_CURRENT_SOURCE_DIR}/Dockerfile.${OS_NAME})
if (MKTREE_BACKEND STREQUAL podman)
if (MKTREE_BACKEND STREQUAL oci)
find_program(PODMAN podman)
find_program(DOCKER docker)
mark_as_advanced(PODMAN DOCKER)
if (PODMAN AND EXISTS ${DOCKERFILE})
set(MKTREE_NATIVE yes)
configure_file(${DOCKERFILE} Dockerfile COPYONLY)
add_custom_target(ci
COMMAND ./mktree.podman build
COMMAND ./mktree.podman check --unattended
COMMAND ./mktree.oci build
COMMAND ./mktree.oci check --unattended
${JOBS} $(TESTOPTS)
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
)
Expand Down
2 changes: 1 addition & 1 deletion tests/mktree.docker
11 changes: 1 addition & 10 deletions tests/mktree.podman → tests/mktree.oci
Original file line number Diff line number Diff line change
@@ -1,15 +1,6 @@
#!/bin/bash
#
# Podman-based mktree backend using OCI images.
#
# If a Dockerfile matching the host distribution is found, it is built and then
# combined with the local RPM build to produce the final image ("native" mode).
# Otherwise, the default Dockerfile is used and RPM is built as part of the
# image ("non-native" mode).
#
# This script can also be invoked directly from the source directory, in which
# case it performs a non-native build (useful for CI purposes). If invoked via
# the mktree.docker symlink, docker is used instead of podman.
# OCI-based mktree backend

PROGRAM=$(basename $0)
if [ "$PROGRAM" == "mktree" ]; then
Expand Down

0 comments on commit 553af1a

Please sign in to comment.