From 5a2e5ef3c47d0487a29d9f93832b160079f0b5f8 Mon Sep 17 00:00:00 2001 From: John Schug Date: Sat, 7 Aug 2021 00:45:57 -0700 Subject: [PATCH] Bump version --- .github/workflows/ci.yml | 1 + Cargo.toml | 5 ++--- docker/Dockerfile.static | 19 +++++++++++-------- gpgme-sys/Cargo.toml | 4 +--- 4 files changed, 15 insertions(+), 14 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 93e71760..5e7d418c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -65,6 +65,7 @@ jobs: docker-windows: name: Test Suite (windows, docker) runs-on: windows-latest + continue-on-error: true steps: - name: Checkout repository uses: actions/checkout@v2 diff --git a/Cargo.toml b/Cargo.toml index 75758832..a315d4be 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,8 +1,7 @@ [package] name = "gpgme" -version = "0.9.2" +version = "0.10.0" edition = "2018" -authors = ["John Schug "] license = "LGPL-2.1" readme = "README.md" repository = "https://github.com/gpg-rs/gpgme" @@ -31,7 +30,7 @@ static_assertions = "1.1" [dependencies.ffi] package = "gpgme-sys" path = "gpgme-sys" -version = "0.9.1" +version = "0.10.0" [[bin]] name = "pinentry" diff --git a/docker/Dockerfile.static b/docker/Dockerfile.static index 505aefd5..b475e6b5 100644 --- a/docker/Dockerfile.static +++ b/docker/Dockerfile.static @@ -10,30 +10,33 @@ ENV TARGET "x86_64-unknown-linux-musl" # environment variable. # ARG GETTEXT_VER=0.21 # WORKDIR /usr/src -# RUN curl -sL "https://ftp.gnu.org/gnu/gettext/gettext-${GETTEXT_VER}.tar.xz" | tar -xj -# WORKDIR "gettext-$GETTEXT_VER" +# ADD https://ftp.gnu.org/gnu/gettext/gettext-${GETTEXT_VER}.tar.xz ./ +# RUN tar -xjf gettext-${GETTEXT_VER}.tar.xz +# WORKDIR gettext-$GETTEXT_VER # RUN ./configure --host "$TARGET" --prefix="$PREFIX" --with-pic --enable-fast-install --disable-dependency-tracking --without-emacs --disable-java --disable-csharp --disable-c++ # RUN make -j$(nproc) install ARG LIBGPG_ERROR_VER=1.42 WORKDIR /usr/src -RUN curl -sSL "https://www.gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-${LIBGPG_ERROR_VER}.tar.bz2" | tar -xj +ADD https://www.gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-${LIBGPG_ERROR_VER}.tar.bz2 ./ +RUN tar -xjf libgpg-error-${LIBGPG_ERROR_VER}.tar.bz2 WORKDIR libgpg-error-$LIBGPG_ERROR_VER RUN ./configure --host "$TARGET" --prefix="$PREFIX" --with-pic --enable-fast-install --disable-dependency-tracking --enable-static --disable-shared --disable-nls --disable-doc --disable-languages --disable-tests RUN make -j$(nproc) install -RUN true ARG LIBASSUAN_VER=2.5.5 WORKDIR /usr/src -RUN curl -sSL "https://www.gnupg.org/ftp/gcrypt/libassuan/libassuan-${LIBASSUAN_VER}.tar.bz2" | tar -xj -WORKDIR "libassuan-$LIBASSUAN_VER" +ADD https://www.gnupg.org/ftp/gcrypt/libassuan/libassuan-${LIBASSUAN_VER}.tar.bz2 ./ +RUN tar -xjf libassuan-${LIBASSUAN_VER}.tar.bz2 +WORKDIR libassuan-$LIBASSUAN_VER RUN ./configure --host "$TARGET" --prefix="$PREFIX" --with-pic --enable-fast-install --disable-dependency-tracking --enable-static --disable-shared --disable-doc --with-gpg-error-prefix="$PREFIX" RUN make -j$(nproc) install ARG GPGME_VER=1.16.0 WORKDIR /usr/src -RUN curl -sSL "https://www.gnupg.org/ftp/gcrypt/gpgme/gpgme-${GPGME_VER}.tar.bz2" | tar -xj -WORKDIR "gpgme-$GPGME_VER" +ADD https://www.gnupg.org/ftp/gcrypt/gpgme/gpgme-${GPGME_VER}.tar.bz2 ./ +RUN tar -xjf gpgme-${GPGME_VER}.tar.bz2 +WORKDIR gpgme-$GPGME_VER RUN ./configure --host "$TARGET" --prefix="$PREFIX" --with-pic --enable-fast-install --disable-dependency-tracking --enable-static --disable-shared --disable-languages --disable-gpg-test --with-gpg-error-prefix="$PREFIX" --with-libassuan-prefix="$PREFIX" RUN make -j$(nproc) install diff --git a/gpgme-sys/Cargo.toml b/gpgme-sys/Cargo.toml index 4c53df5a..21bc1c30 100644 --- a/gpgme-sys/Cargo.toml +++ b/gpgme-sys/Cargo.toml @@ -1,8 +1,7 @@ [package] name = "gpgme-sys" -version = "0.9.1" +version = "0.10.0" edition = "2018" -authors = ["John Schug "] license = "LGPL-2.1" repository = "https://github.com/gpg-rs/gpgme/gpgme-sys" documentation = "https://docs.rs/gpgme-sys" @@ -13,7 +12,6 @@ links = "gpgme" build = "build.rs" [badges] -travis-ci = { repository = "gpg-rs/gpgme" } maintenance = { status = "experimental" } [lib]