diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e566f67..b97a8b2 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -143,7 +143,7 @@ jobs: sudo apt-get install -y wait-for-it python3 python3-pip pip3 install schemathesis cd rollup-http/rollup-http-server - wget https://raw.githubusercontent.com/cartesi/openapi-interfaces/main/rollup.yaml + wget https://raw.githubusercontent.com/cartesi/openapi-interfaces/v0.9.0/rollup.yaml MOCK_BUILD=true cargo run -- "echo 1" & wait-for-it localhost:5004 --timeout=30 st run rollup.yaml --checks all --validate-schema true --hypothesis-phases explicit --base-url http://localhost:5004 diff --git a/CHANGELOG.md b/CHANGELOG.md index 573d58d..7e10752 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [0.16.1] - 2024-08-12 +### Fixed +- Fixed curl version on rootfs +- Fixed openapi spec dependency version in the CI test + ## [0.16.0] - 2024-07-26 ### Changed - Updated xgenext2fs to v1.5.6 @@ -170,7 +175,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - [0.2.0] - [0.1.0] -[Unreleased]: https://github.com/cartesi/machine-emulator-tools/compare/v0.16.0...HEAD +[Unreleased]: https://github.com/cartesi/machine-emulator-tools/compare/v0.16.1...HEAD +[0.16.1]: https://github.com/cartesi/machine-emulator-tools/releases/tag/v0.16.1 [0.16.0]: https://github.com/cartesi/machine-emulator-tools/releases/tag/v0.16.0 [0.15.0]: https://github.com/cartesi/machine-emulator-tools/releases/tag/v0.15.0 [0.14.1]: https://github.com/cartesi/machine-emulator-tools/releases/tag/v0.14.1 diff --git a/Makefile b/Makefile index 1cc50cb..08aa217 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ MAJOR := 0 MINOR := 16 -PATCH := 0 +PATCH := 1 LABEL := VERSION := $(MAJOR).$(MINOR).$(PATCH)$(LABEL) diff --git a/fs/Dockerfile b/fs/Dockerfile index 3d2d728..fdccf7f 100644 --- a/fs/Dockerfile +++ b/fs/Dockerfile @@ -4,13 +4,13 @@ ENV BUILD_BASE=/tmp/build-extra # Install dependencies RUN DEBIAN_FRONTEND=noninteractive apt-get update && \ apt-get install -y --no-install-recommends \ - ca-certificates \ - wget \ - patch \ - libdigest-sha-perl \ - libc6-dev-riscv64-cross \ - gcc-12-riscv64-linux-gnu \ - && \ + ca-certificates \ + wget \ + patch \ + libdigest-sha-perl \ + libc6-dev-riscv64-cross \ + gcc-12-riscv64-linux-gnu \ + && \ adduser developer -u 499 --gecos ",,," --disabled-password && \ mkdir -p ${BUILD_BASE} && chown -R developer:developer ${BUILD_BASE} && \ rm -rf /var/lib/apt/lists/* @@ -35,20 +35,20 @@ ARG TOOLS_DEB=machine-emulator-tools-v0.15.0.deb ADD ${TOOLS_DEB} /tmp/ RUN apt-get update && \ apt-get install -y --no-install-recommends \ - busybox-static=1:1.30.1-7ubuntu3 \ - coreutils=8.32-4.1ubuntu1 \ - bash=5.1-6ubuntu1 \ - psmisc=23.4-2build3 \ - bc=1.07.1-3build1 \ - curl=7.81.0-1ubuntu1.16 \ - device-tree-compiler=1.6.1-1 \ - jq=1.6-2.1ubuntu3 \ - lua5.4=5.4.4-1 \ - lua-socket=3.0~rc1+git+ac3201d-6 \ - xxd=2:8.2.3995-1ubuntu2.16 \ - file=1:5.41-3ubuntu0.1 \ - /tmp/${TOOLS_DEB} \ - && \ + busybox-static=1:1.30.1-7ubuntu3 \ + coreutils=8.32-4.1ubuntu1 \ + bash=5.1-6ubuntu1 \ + psmisc=23.4-2build3 \ + bc=1.07.1-3build1 \ + curl=7.81.0-1ubuntu1.17 \ + device-tree-compiler=1.6.1-1 \ + jq=1.6-2.1ubuntu3 \ + lua5.4=5.4.4-1 \ + lua-socket=3.0~rc1+git+ac3201d-6 \ + xxd=2:8.2.3995-1ubuntu2.16 \ + file=1:5.41-3ubuntu0.1 \ + /tmp/${TOOLS_DEB} \ + && \ rm -rf /var/lib/apt/lists/* /tmp/${TOOLS_DEB} COPY --chown=root:root --from=cross-builder /tmp/build-extra/benchmarks/whetstone /usr/bin/ COPY --chown=root:root --from=cross-builder /tmp/build-extra/benchmarks/dhrystone /usr/bin/