Merge pull request #333 from puiterwijk/bump-fedora

Superhepper · web-flow · commit 644410983c5b · 2022-03-15T16:43:03.000+01:00
Bump Fedora version for CI to Fedora 35
diff --git a/README.md b/README.md
@@ -10,7 +10,7 @@ At the moment we test (via CI) and support the following Rust compiler versions:
 * On Ubuntu we test with:
     - The latest stable compiler version, as accessible through `rustup`.
     - The 1.53 compiler version.
-* On Fedora we test with the compiler version included with the Fedora 33 release.
+* On Fedora we test with the compiler version included with the Fedora 35 release.
 
 If you need support for other versions of the compiler, get in touch with us to see what we can do!
 
diff --git a/tss-esapi/tests/Dockerfile-fedora b/tss-esapi/tests/Dockerfile-fedora
@@ -1,4 +1,4 @@
-FROM fedora:33
+FROM fedora:35
 
 RUN dnf install -y \
 	tpm2-tss-devel tpm2-abrmd tpm2-tools \
diff --git a/tss-esapi/tests/all-fedora.sh b/tss-esapi/tests/all-fedora.sh
@@ -18,6 +18,7 @@ swtpm_setup --tpm2 \
     --tpmstate /tmp/tpmdir \
     --createek --decryption --create-ek-cert \
     --create-platform-cert \
+    --pcr-banks sha1,sha256 \
     --display
 swtpm socket --tpm2 \
     --tpmstate dir=/tmp/tpmdir \

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM fedora:33`
	`1`	`+FROM fedora:35`
`2`	`2`
`3`	`3`	`RUN dnf install -y \`
`4`	`4`	`tpm2-tss-devel tpm2-abrmd tpm2-tools \`