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

ci: Move codestyle and min build to GH actions #2610

Merged
merged 1 commit into from
May 17, 2022
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
29 changes: 0 additions & 29 deletions .cci.jenkinsfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
// Documentation: https://github.com/coreos/coreos-ci/blob/main/README-upstream-ci.md

stage("Build") {
parallel normal: {
def n = 5
buildPod(memory: "2Gi", cpu: "${n}") {
checkout scm
Expand Down Expand Up @@ -36,34 +35,6 @@ parallel normal: {
}
stash includes: "installed/", name: 'build'
}
},
// A minimal build, helps test our build options
minimal: {
buildPod() {
checkout scm
shwrap("""
git submodule update --init

env NOCONFIGURE=1 ./autogen.sh
./configure --without-curl --without-soup --disable-gtk-doc --disable-man \
--disable-rust --without-libarchive --without-selinux --without-smack \
--without-openssl --without-avahi --without-libmount --disable-rofiles-fuse \
--without-libsodium
make
""")
}
},
codestyle: {
buildPod() {
checkout scm
shwrap("""
# Jenkins by default only fetches the branch it's testing. Explicitly fetch main
# for ci-commitmessage-submodules.sh
git fetch origin +refs/heads/main:refs/remotes/origin/main
ci/ci-commitmessage-submodules.sh
""")
}
}
}

// Build FCOS and do a kola basic run
Expand Down
33 changes: 33 additions & 0 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,39 @@ permissions:
contents: read

jobs:
codestyle:
name: "Code style"
runs-on: ubuntu-latest
container: registry.ci.openshift.org/coreos/fcos-buildroot:testing-devel
steps:
- name: Checkout repository
uses: actions/checkout@v2
with:
fetch-depth: 0
submodules: true
# https://github.com/actions/checkout/issues/760
- name: Mark git checkout as safe
run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
- name: Test style
run: ./ci/ci-commitmessage-submodules.sh
minimal:
name: "Build - FCOS minimal"
runs-on: ubuntu-latest
container: registry.ci.openshift.org/coreos/fcos-buildroot:testing-devel
steps:
- name: Checkout repository
uses: actions/checkout@v2
# https://github.com/actions/checkout/issues/760
- name: Mark git checkout as safe
run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
- name: Build
run: |
env NOCONFIGURE=1 ./autogen.sh &&
./configure --without-curl --without-soup --disable-gtk-doc --disable-man \
--disable-rust --without-libarchive --without-selinux --without-smack \
--without-openssl --without-avahi --without-libmount --disable-rofiles-fuse \
--without-libsodium &&
make
tests:
# Distro configuration matrix
#
Expand Down
1 change: 1 addition & 0 deletions ci/ci-commitmessage-submodules.sh
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ gitdir=$(realpath $(pwd))
# try to read the submodules from the Internet again. If we wanted to
# require a newer git, we could use `git worktree`.
cp -a ${gitdir} ${tmpd}/workdir
git config --global --add safe.directory "${tmpd}/workdir"
cd ${tmpd}/workdir
git log --pretty=oneline origin/main..$HEAD | while read logline; do
commit=$(echo ${logline} | cut -f 1 -d ' ')
Expand Down