Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Skip building the image when submitting to OBS #12

Merged
merged 1 commit into from
Aug 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
steps:

- name: Git Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4

# the OBS build actually uses the image from YaST:Head, patch the config
# to use the same base image also in the GitHub Action
Expand Down
17 changes: 7 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
# The YaST C++ Testing Image

[![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)
[![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)

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

## Automatic Rebuilds

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


## The Image Content

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

## Using the Image in the Other Projects

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

The workflow is:

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

## Examples

Expand All @@ -66,7 +63,7 @@ jobs:
steps:

- name: Git Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Prepare System
run: |
Expand Down
4 changes: 2 additions & 2 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ end
# do not create a tarball, this project builds a Docker container
Rake::Task["tarball"].clear_actions

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