From 92fca001547df39efd660452d2028b45e27c3733 Mon Sep 17 00:00:00 2001 From: Hans-Nikolai Viessmann Date: Sun, 6 Dec 2020 17:11:21 +0100 Subject: [PATCH 1/2] [ci] change to centos8 and ubi18 ubi14 and centos6 are now EOL, repos have been de-activated. --- .gitlab-ci.yml | 60 +++++++++++++++++++++++++------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bcbcbe692..cf2945b90 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -129,6 +129,27 @@ stdlib-archlinux: dependencies: - test-archlinux +### CENTOS 8 ### + +build-centos8: + <<: *build-template + tags: + - centos8 + +test-centos8: + <<: *test-template + tags: + - centos8 + dependencies: + - build-centos8 + +stdlib-centos8: + <<: *build-stdlib-template + tags: + - centos8 + dependencies: + - test-centos8 + ### CENTOS 7 ### build-centos7: @@ -150,26 +171,26 @@ stdlib-centos7: dependencies: - test-centos7 -### CENTOS 6 ### +### UBUNTU 18 ### -build-centos6: +build-ubuntu18: <<: *build-template tags: - - centos6 + - ubuntu18 -test-centos6: +test-ubuntu18: <<: *test-template tags: - - centos6 + - ubuntu18 dependencies: - - build-centos6 + - build-ubuntu18 -stdlib-centos6: +stdlib-ubuntu18: <<: *build-stdlib-template tags: - - centos6 + - ubuntu18 dependencies: - - test-centos6 + - test-ubuntu18 ### UBUNTU 16 ### @@ -191,24 +212,3 @@ stdlib-ubuntu16: - ubuntu16 dependencies: - test-ubuntu16 - -### UBUNTU 14 ### - -build-ubuntu14: - <<: *build-template - tags: - - ubuntu14 - -test-ubuntu14: - <<: *test-template - tags: - - ubuntu14 - dependencies: - - build-ubuntu14 - -stdlib-ubuntu14: - <<: *build-stdlib-template - tags: - - ubuntu14 - dependencies: - - test-ubuntu14 -- GitLab From 1420bee4a965393beeb13dc23e2c003c0b75c1dd Mon Sep 17 00:00:00 2001 From: Hans-Nikolai Viessmann Date: Sun, 6 Dec 2020 22:53:44 +0100 Subject: [PATCH 2/2] wrong init value used for CudaExecMode type in AST --- src/libsac2c/xml/ast.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libsac2c/xml/ast.xml b/src/libsac2c/xml/ast.xml index bfe1c505c..29188cf93 100644 --- a/src/libsac2c/xml/ast.xml +++ b/src/libsac2c/xml/ast.xml @@ -74,7 +74,7 @@ copy="function" /> - @@ -6491,7 +6491,7 @@ N_tfarg : - + -- GitLab