From 60404565e54181bcbb8ef026d1b1a449bfa6afba Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Mon, 9 May 2022 14:53:40 -0400 Subject: [PATCH] rust-bindings: Remove some unused CI/test bits We're not using Vagrant or Gitlab, and our container flow is different. --- rust-bindings/.gitlab-ci.yml | 90 ------------------------------------ rust-bindings/Dockerfile | 21 --------- rust-bindings/Vagrantfile | 10 ---- 3 files changed, 121 deletions(-) delete mode 100644 rust-bindings/.gitlab-ci.yml delete mode 100644 rust-bindings/Dockerfile delete mode 100644 rust-bindings/Vagrantfile diff --git a/rust-bindings/.gitlab-ci.yml b/rust-bindings/.gitlab-ci.yml deleted file mode 100644 index fe56a21f..00000000 --- a/rust-bindings/.gitlab-ci.yml +++ /dev/null @@ -1,90 +0,0 @@ -include: /.ci/gitlab-ci-base.yml - -stages: - - test - - publish - -# generate feature test jobs -generate-test-jobs: - stage: .pre - image: rust - script: - - mkdir -p target - - apt-get update && apt-get install -y jq - - .ci/generate-test-jobs.sh > target/test-jobs.yaml - artifacts: - paths: - - target/test-jobs.yaml - -# test -check: - stage: test - extends: .rust-ostree-devel - script: - - rustup component add clippy rustfmt - # fmt - - cargo fmt --package ostree -- --check - # check generated code - - rm -rf src/auto/ - - make gir - - git checkout -- sys/src/auto/versions.txt src/auto/versions.txt - - git diff -R --exit-code - # clippy - - cargo clippy --workspace --all-features - -test_default-features: - extends: .fedora-ostree-devel - script: - - cargo test --verbose --workspace - -test_all_features: - stage: test - trigger: - include: - - artifact: target/test-jobs.yaml - job: generate-test-jobs - strategy: depend - -build_aarch64: - stage: test - extends: .rust-ostree-devel - script: - - rustup target add aarch64-unknown-linux-gnu - - PKG_CONFIG_ALLOW_CROSS=1 cargo build --verbose --workspace --all-features --target aarch64-unknown-linux-gnu - -# docs -pages: - stage: publish - extends: .rust-ostree-devel - image: rustlang/rust:nightly - variables: - RUSTDOCFLAGS: >- - -Z unstable-options - --extern-html-root-url glib=https://gtk-rs.org/docs - --extern-html-root-url gio=https://gtk-rs.org/docs - script: - - make merge-lgpl-docs - - cargo doc --verbose --workspace --features dox --no-deps - - cp -r target/doc public - artifacts: - paths: - - public - only: - - main - -# publish -publish_ostree-sys: - stage: publish - extends: .rust-ostree-devel - script: - - cargo publish --verbose --manifest-path sys/Cargo.toml --token $CRATES_IO_TOKEN - only: - - /^ostree-sys\/.+$/ - -publish_ostree: - stage: publish - extends: .rust-ostree-devel - script: - - cargo publish --verbose --token $CRATES_IO_TOKEN - only: - - /^ostree\/.+$/ diff --git a/rust-bindings/Dockerfile b/rust-bindings/Dockerfile deleted file mode 100644 index 2849b5a6..00000000 --- a/rust-bindings/Dockerfile +++ /dev/null @@ -1,21 +0,0 @@ -FROM registry.fedoraproject.org/fedora:latest - -RUN dnf install -y gcc git make 'dnf-command(builddep)' -RUN dnf builddep -y ostree - -ARG OSTREE_REPO -ARG OSTREE_VERSION -RUN mkdir /src && \ - cd /src && \ - git init . && \ - git fetch --depth 1 $OSTREE_REPO $OSTREE_VERSION && \ - git checkout FETCH_HEAD && \ - git submodule update --init -RUN mkdir /build && \ - cd /build && \ - NOCONFIGURE=1 /src/autogen.sh && \ - /src/configure \ - --with-openssl \ - --with-curl \ - && \ - make -j4 diff --git a/rust-bindings/Vagrantfile b/rust-bindings/Vagrantfile deleted file mode 100644 index 996bb981..00000000 --- a/rust-bindings/Vagrantfile +++ /dev/null @@ -1,10 +0,0 @@ -# -*- mode: ruby -*- -# vi: set ft=ruby : -Vagrant.configure("2") do |config| - config.vm.box = "bento/fedora-latest" - - config.vm.provision "shell", inline: <<-SHELL - dnf install -y cargo curl make ostree-devel podman rust - echo "cd /vagrant" >> ~vagrant/.bash_profile - SHELL -end