Skip to content

Commit

Permalink
Debug CI
Browse files Browse the repository at this point in the history
  • Loading branch information
arg0d committed Jan 5, 2025
1 parent 34c9ba4 commit 51735a0
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ jobs:
test:
runs-on: ubuntu-22.04
container:
image: ghcr.io/nordsecurity/uniffi-rs-test-runner:v0.0.2
image: ghcr.io/nordsecurity/uniffi-rs-test-runner:v0.3.0
options: --user root
steps:
- uses: actions/checkout@v3
Expand Down
8 changes: 4 additions & 4 deletions docker/Dockerfile-build
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# This builds a docker image containing all the tools we need to run our
# test suite in CI, including rust, kotlin, and swift.

FROM rust:1.69.0
FROM rust:1.77.1-bookworm

MAINTAINER Jakub Janowski "[email protected]"
LABEL org.opencontainers.image.source=https://github.com/NordSecurity/uniffi-rs
Expand All @@ -23,7 +23,7 @@ SHELL ["/bin/bash", "-c"]
RUN apt-get update -qq \
&& apt-get install -qy --no-install-recommends \
clang \
openjdk-11-jdk-headless \
openjdk-17-jdk-headless \
ruby \
ruby-dev \
zip \
Expand All @@ -45,11 +45,11 @@ RUN rustup self update \

RUN mkdir -p /tmp/setup-swift \
&& cd /tmp/setup-swift \
&& curl -o swift.tar.gz https://download.swift.org/swift-5.5-release/ubuntu1804/swift-5.5-RELEASE/swift-5.5-RELEASE-ubuntu18.04.tar.gz \
&& curl -o swift.tar.gz https://download.swift.org/swift-6.0.3-release/debian12/swift-6.0.3-RELEASE/swift-6.0.3-RELEASE-debian12.tar.gz \
# XXX TODO: should check a sha256sum or something here...
&& ls -la \
&& tar -xzf swift.tar.gz \
&& mv swift-5.5-RELEASE-ubuntu18.04 /opt/swift \
&& mv swift-6.0.3-RELEASE-debian12 /opt/swift \
&& cd ../ \
&& rm -rf ./setup-swift

Expand Down
4 changes: 3 additions & 1 deletion docker/cargo-docker.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#!/usr/bin/env bash

export MSYS_NO_PATHCONV=1

SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)"
ROOT_DIR="$SCRIPT_DIR/.."

Expand All @@ -17,4 +19,4 @@ docker run \
-w /mounted_workdir/$(realpath -m --relative-to=$ROOT_DIR $PWD) \
-e TERM="xterm-256color" \
--group-add $(id -g) \
ghcr.io/nordsecurity/uniffi-rs-test-runner:v0.0.2 bash -i -c "umask 0002 && $*"
ghcr.io/nordsecurity/uniffi-rs-test-runner:v0.3.0 bash -i -c "umask 0002 && $*"
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ assert(g == getGuidProcmacro(g: g))
print("AAAAAAAAAAAAAAAAAAAAAAA 10")
fflush(stdout)

Thread.sleep(forTimeInterval: 1)
// Thread.sleep(forTimeInterval: 1)

print("AAAAAAAAAAAAAAAAAAAAAAA 11")
fflush(stdout)
// print("AAAAAAAAAAAAAAAAAAAAAAA 11")
// fflush(stdout)

0 comments on commit 51735a0

Please sign in to comment.