From: Felix Krull <f_krull@gmx.de>
Date: Fri, 6 Mar 2020 20:10:52 +0000 (+0100)
Subject: ci: ignore gir differences in version files
X-Git-Tag: archive/raspbian/2022.4-1+rpi1^2~9^2^2~20^2~156
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=6ab1e997eefb383ea061b095c837b0cdad44ee0a;p=ostree.git

ci: ignore gir differences in version files
---

diff --git a/rust-bindings/rust/.gitlab-ci.yml b/rust-bindings/rust/.gitlab-ci.yml
index 26e6fff0..af1cae59 100644
--- a/rust-bindings/rust/.gitlab-ci.yml
+++ b/rust-bindings/rust/.gitlab-ci.yml
@@ -27,6 +27,7 @@ check:
   - cargo fmt --package ostree -- --check
   - rm -rf src/auto/
   - make gir
+  - git checkout -- sys/src/auto/versions.txt src/auto/versions.txt
   - git diff -R --exit-code
 
 # build
diff --git a/rust-bindings/rust/Makefile b/rust-bindings/rust/Makefile
index 47d2b1b4..822ad7ea 100644
--- a/rust-bindings/rust/Makefile
+++ b/rust-bindings/rust/Makefile
@@ -12,9 +12,7 @@ target/tools/bin/gir:
 
 gir: target/tools/bin/gir
 	target/tools/bin/gir -c conf/ostree-sys.toml
-	sed -i '/^from gir-files/d' sys/src/auto/versions.txt
 	target/tools/bin/gir -c conf/ostree.toml
-	sed -i '/^from gir-files/d' src/auto/versions.txt
 
 gir-report: gir
 	target/tools/bin/gir -c conf/ostree.toml -m not_bound
diff --git a/rust-bindings/rust/src/auto/versions.txt b/rust-bindings/rust/src/auto/versions.txt
index e5155d7e..9cdf44f2 100644
--- a/rust-bindings/rust/src/auto/versions.txt
+++ b/rust-bindings/rust/src/auto/versions.txt
@@ -1 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ d1e88f9)
+Generated by gir (https://github.com/gtk-rs/gir @ d1e88f94)
+from gir-files (https://github.com/gtk-rs/gir-files @ ab7796a)
diff --git a/rust-bindings/rust/sys/src/auto/versions.txt b/rust-bindings/rust/sys/src/auto/versions.txt
index e5155d7e..9cdf44f2 100644
--- a/rust-bindings/rust/sys/src/auto/versions.txt
+++ b/rust-bindings/rust/sys/src/auto/versions.txt
@@ -1 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ d1e88f9)
+Generated by gir (https://github.com/gtk-rs/gir @ d1e88f94)
+from gir-files (https://github.com/gtk-rs/gir-files @ ab7796a)