From 21ac6c03e431a5612bd3f2f254d0d93fc3f34c9a Mon Sep 17 00:00:00 2001 From: Marcelo Politzer <251334+mpolitzer@users.noreply.github.com> Date: Mon, 13 May 2024 08:25:24 -0300 Subject: [PATCH] feat: add package.json with version to the debian file --- .github/workflows/main.yml | 3 +++ Dockerfile | 2 ++ Makefile | 8 +++++--- control.template => control.in | 0 package.json.in | 4 ++++ 5 files changed, 14 insertions(+), 3 deletions(-) rename control.template => control.in (100%) create mode 100644 package.json.in diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b70c7d6e..bbc91d4b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -47,6 +47,9 @@ jobs: - name: Create debian package control file run: make control + - name: Create version file + run: make package.json + - name: Buildx setup uses: docker/setup-buildx-action@v2 diff --git a/Dockerfile b/Dockerfile index 9a4925ed..0bf25de0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -153,11 +153,13 @@ ARG STAGING_BASE=${BUILD_BASE}/_install ARG STAGING_DEBIAN=${STAGING_BASE}/DEBIAN ARG STAGING_SBIN=${STAGING_BASE}/usr/sbin ARG STAGING_BIN=${STAGING_BASE}/usr/bin +ARG STAGING_SHARE=${STAGING_BASE}/usr/share/machine-emulator-tools RUN mkdir -p ${STAGING_DEBIAN} ${STAGING_SBIN} ${STAGING_BIN} ${STAGING_BASE}/etc && \ echo "cartesi-machine" > ${staging_base}/etc/hostname COPY control ${STAGING_DEBIAN}/control +COPY package.json ${STAGING_SHARE}/package.json COPY postinst ${STAGING_DEBIAN}/postinst COPY --from=builder ${BUILD_BASE}/tools/sys-utils/cartesi-init/cartesi-init ${STAGING_SBIN} diff --git a/Makefile b/Makefile index 3e668626..edff67ac 100644 --- a/Makefile +++ b/Makefile @@ -31,7 +31,7 @@ LINUX_HEADERS_URLPATH := https://github.com/cartesi/image-kernel/releases/downlo all: fs -build: control +build: control package.json @docker buildx build --load \ --build-arg TOOLS_DEB=$(TOOLS_DEB) \ --build-arg IMAGE_KERNEL_VERSION=$(IMAGE_KERNEL_VERSION) \ @@ -49,8 +49,10 @@ copy: $(TOOLS_DEB) deb: build -control: Makefile control.template - @sed 's|ARG_VERSION|$(VERSION)|g' control.template > control +control: Makefile control.in + @sed 's|ARG_VERSION|$(VERSION)|g' control.in > control +package.json: Makefile package.json.in + @sed 's|ARG_VERSION|$(VERSION)|g' package.json.in > package.json $(TOOLS_ROOTFS) fs: $(TOOLS_DEB) @docker buildx build --platform=linux/riscv64 \ diff --git a/control.template b/control.in similarity index 100% rename from control.template rename to control.in diff --git a/package.json.in b/package.json.in new file mode 100644 index 00000000..f5188c64 --- /dev/null +++ b/package.json.in @@ -0,0 +1,4 @@ +{ + "name": "machine-emulator-tools", + "version": "ARG_VERSION" +}