Skip to content

Commit 0d1447c

Browse files
committed
Skip building the image when submitting to OBS
- The Docker image is built with plain `docker build` instead of `osc build` - See .github/workflows/ci.yml for more details - Updated documentation
1 parent 2076110 commit 0d1447c

File tree

3 files changed

+10
-13
lines changed

3 files changed

+10
-13
lines changed

.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
steps:
1313

1414
- name: Git Checkout
15-
uses: actions/checkout@v2
15+
uses: actions/checkout@v4
1616

1717
# the OBS build actually uses the image from YaST:Head, patch the config
1818
# to use the same base image also in the GitHub Action

README.md

+7-10
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
# The YaST C++ Testing Image
22

33
[![CI](https://github.com/yast/ci-cpp-container/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/yast/ci-cpp-container/actions/workflows/ci.yml)
4+
[![OBS](https://github.com/yast/ci-cpp-container/actions/workflows/submit.yml/badge.svg)](https://github.com/yast/ci-cpp-container/actions/workflows/submit.yml)
45

56
This git repository contains the configuration used to build the docker
6-
image used for [TravisCI](https://travis-ci.org/).
7+
image used for [GitHub Actions](https://docs.github.com/en/actions).
78
The resulting docker image is available at https://registry.opensuse.org/.
89

910
## Automatic Rebuilds
1011

1112
- The image is rebuilt whenever a commit it pushed to the `master` branch.
12-
- The [yast-ci-cpp-container-master](
13-
https://ci.opensuse.org/view/Yast/job/yast-ci-cpp-container-master/)
14-
Jenkins job copies the configuration to the [YaST:Head/ci-cpp-container](
13+
- The [submit.yml](./.github/workflows/submit.yml)
14+
GitHub Action commits the configuration to the [YaST:Head/ci-cpp-container](
1515
https://build.opensuse.org/package/show/YaST:Head/ci-cpp-container)
1616
OBS project
1717
- The OBS tracks the dependencies and rebuilds the image if any dependant package
@@ -22,7 +22,6 @@ The resulting docker image is available at https://registry.opensuse.org/.
2222
If for some reason the automatic rebuild do not work or it failed you can
2323
trigger the rebuild in the OBS just like for the other regular packages.
2424

25-
2625
## The Image Content
2726

2827
This image is based on the latest openSUSE Tumbleweed image, additionally
@@ -32,7 +31,7 @@ in C++. It is possible to install additional packagers if needed, see the
3231

3332
## Using the Image in the Other Projects
3433

35-
The image contains the `yast-travis-cpp` script which runs all the checks and tests.
34+
The image contains the `yast-ci-cpp` script which runs all the checks and tests.
3635

3736
The workflow is:
3837

@@ -41,9 +40,7 @@ The workflow is:
4140
command from the local `Dockerfile`. If the package can be used by more modules
4241
you can add it into the base Docker image here.
4342
- Run the `yast-ci-cpp` script. (Optionally you can use the `-x` and `-o`
44-
options to split the work into several smaller tasks and run them in parallel,
45-
see the [yast2-storage-ng example](
46-
https://github.com/yast/yast-storage-ng/blob/master/.travis.yml).)
43+
options to split the work into several smaller tasks and run them in parallel.)
4744

4845
## Examples
4946

@@ -66,7 +63,7 @@ jobs:
6663
steps:
6764

6865
- name: Git Checkout
69-
uses: actions/checkout@v2
66+
uses: actions/checkout@v4
7067

7168
- name: Prepare System
7269
run: |

Rakefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ end
1111
# do not create a tarball, this project builds a Docker container
1212
Rake::Task["tarball"].clear_actions
1313

14-
# building at Jenkins does not work for some reason, disable it for now
15-
Rake::Task["osc:build"].clear if ENV["JENKINS_HOME"]
14+
# building at Jenkins/GitHub Actions does not work, disable it for now
15+
Rake::Task["osc:build"].clear if ENV["JENKINS_HOME"] || ENV["CI"]
1616

0 commit comments

Comments
 (0)