You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@buildstream.apache.org by ju...@apache.org on 2022/01/14 14:15:43 UTC
[buildstream] branch bst-1 updated: .github: Test in current supported fedora34 (32 and 33 and EOL)
This is an automated email from the ASF dual-hosted git repository.
juergbi pushed a commit to branch bst-1
in repository https://gitbox.apache.org/repos/asf/buildstream.git
The following commit(s) were added to refs/heads/bst-1 by this push:
new 2288d5c .github: Test in current supported fedora34 (32 and 33 and EOL)
new 1712fff Merge pull request #1552 from jjardon/jjardon/bst-1-fedora-34
2288d5c is described below
commit 2288d5cfddac7e68e509105d3ee0b1c23450418c
Author: Javier Jardón <jj...@gnome.org>
AuthorDate: Fri Jan 7 19:19:58 2022 +0000
.github: Test in current supported fedora34 (32 and 33 and EOL)
---
.github/common.env | 2 +-
.github/compose/ci.docker-compose.yml | 10 +++-------
.github/run-ci.sh | 3 +--
.github/workflows/ci.yml | 3 +--
4 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/.github/common.env b/.github/common.env
index 196752a..0929e82 100644
--- a/.github/common.env
+++ b/.github/common.env
@@ -1,5 +1,5 @@
# Shared common variables
-CI_IMAGE_VERSION=master-241289109
+CI_IMAGE_VERSION=master-359695845
CI_TOXENV_MAIN=py36-nocover,py37-nocover,py38-nocover,py39-nocover
CI_TOXENV_ALL="${CI_TOXENV_MAIN}"
diff --git a/.github/compose/ci.docker-compose.yml b/.github/compose/ci.docker-compose.yml
index a3bc1f3..1505528 100644
--- a/.github/compose/ci.docker-compose.yml
+++ b/.github/compose/ci.docker-compose.yml
@@ -1,7 +1,7 @@
version: '3.4'
x-tests-template: &tests-template
- image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:32-${CI_IMAGE_VERSION:-latest}
+ image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:34-${CI_IMAGE_VERSION:-latest}
command: tox -vvvvv -- --color=yes --integration -n 4
environment:
TOXENV: ${CI_TOXENV_ALL}
@@ -22,13 +22,9 @@ x-tests-template: &tests-template
services:
- fedora-32:
+ fedora-34:
<<: *tests-template
- image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:32-${CI_IMAGE_VERSION:-latest}
-
- fedora-33:
- <<: *tests-template
- image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:33-${CI_IMAGE_VERSION:-latest}
+ image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:34-${CI_IMAGE_VERSION:-latest}
debian-10:
<<: *tests-template
diff --git a/.github/run-ci.sh b/.github/run-ci.sh
index 80b4a91..1ff5174 100755
--- a/.github/run-ci.sh
+++ b/.github/run-ci.sh
@@ -67,8 +67,7 @@ set -x
if [ -z "${test_names}" ]; then
runTest "lint"
runTest "debian-10"
- runTest "fedora-32"
- runTest "fedora-33"
+ runTest "fedora-34"
runTest "ubuntu-18.04"
runTest "centos-7.7.1908"
else
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 061904e..12e3eaa 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -26,8 +26,7 @@ jobs:
# "../compose/ci.docker-compose.yml"
test-name:
- debian-10
- - fedora-32
- - fedora-33
+ - fedora-34
- ubuntu-18.04
- centos-7.7.1908
- lint