Skip to content
This repository has been archived by the owner on Mar 22, 2023. It is now read-only.

Commit

Permalink
Merge pull request #841 from lukaszstolarczuk/run-most-CI-jobs-on-GHA
Browse files Browse the repository at this point in the history
run most of CI jobs on GHA only
  • Loading branch information
Szymon Romik authored Sep 2, 2020
2 parents e111751 + f6c502e commit 3d9dcf5
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 14 deletions.
9 changes: 4 additions & 5 deletions .github/workflows/gha.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
#
# The 'XXX_DISABLE_' suffix is used in this file to disable these actions:
# 1) XXX_DISABLE_${CI_FILE_PUSH_IMAGE_TO_REPO} - disables pushing the rebuilt Docker image,
# 2) XXX_DISABLE_AUTO_DOC_UPDATE - disables making pull requests with the update of documentation,
# 3) XXX_DISABLE_COVERAGE - disables uploads of coverage reports.
# 1) XXX_DISABLE_COVERAGE - disables uploads of coverage reports.
# They are disabled, because they conflict with the same ones run on Travis.
# Only one CI (Travis or GitHub Actions) can run them at the time, so they can be enabled here,
# when we decide to switch from Travis to GitHub Actions. The 'XXX_DISABLE_' suffix should be removed then.
Expand All @@ -23,14 +21,15 @@ jobs:
env:
DOCKERHUB_USER: ${{ secrets.DOCKERHUB_USER }}
DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
DOC_UPDATE_GITHUB_TOKEN: ${{ secrets.DOC_UPDATE_GITHUB_TOKEN }}
HOST_WORKDIR: /home/runner/work/libpmemobj-cpp/libpmemobj-cpp
WORKDIR: utils/docker
strategy:
matrix:
CONFIG: ["N=1 OS=ubuntu OS_VER=19.10 TYPE=debug PUSH_IMAGE=1",
"N=2 OS=fedora OS_VER=31 TYPE=debug PUSH_IMAGE=1",
"N=3 OS=ubuntu OS_VER=19.10 TYPE=release",
"N=4 OS=fedora OS_VER=31 TYPE=release XXX_DISABLE_AUTO_DOC_UPDATE=1",
"N=4 OS=fedora OS_VER=31 TYPE=release AUTO_DOC_UPDATE=1",
"N=5 OS=ubuntu OS_VER=19.10 TYPE=valgrind",
"N=6 OS=ubuntu OS_VER=19.10 TYPE=memcheck_drd",
"N=7 OS=ubuntu OS_VER=19.10 TYPE=package",
Expand All @@ -50,7 +49,7 @@ jobs:
run: cd $WORKDIR && ${{ matrix.CONFIG }} ./build.sh

- name: Push the image
run: cd $WORKDIR && source ./set-vars.sh && ${{ matrix.CONFIG }} /bin/bash -c "if [[ -f XXX_DISABLE_${CI_FILE_PUSH_IMAGE_TO_REPO} ]]; then images/push-image.sh $OS-$OS_VER; fi"
run: cd $WORKDIR && source ./set-vars.sh && ${{ matrix.CONFIG }} /bin/bash -c "if [[ -f ${CI_FILE_PUSH_IMAGE_TO_REPO} ]]; then images/push-image.sh $OS-$OS_VER; fi"

windows:
name: Windows
Expand Down
8 changes: 0 additions & 8 deletions travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,6 @@ env:
- GITHUB_REPO=pmem/libpmemobj-cpp
- DOCKERHUB_REPO=pmem/libpmemobj-cpp
matrix:
- OS=ubuntu OS_VER=19.10 TYPE=debug PUSH_IMAGE=1
- OS=fedora OS_VER=31 TYPE=debug PUSH_IMAGE=1
- OS=ubuntu OS_VER=19.10 TYPE=release
- OS=fedora OS_VER=31 TYPE=release AUTO_DOC_UPDATE=1
- OS=ubuntu OS_VER=19.10 TYPE=valgrind
- OS=ubuntu OS_VER=19.10 TYPE=memcheck_drd
- OS=ubuntu OS_VER=19.10 TYPE=package
- OS=fedora OS_VER=31 TYPE=package
- OS=ubuntu OS_VER=19.10 TYPE=debug COVERAGE=1
- OS=ubuntu OS_VER=19.10 TYPE=coverity

Expand Down
2 changes: 1 addition & 1 deletion utils/docker/run-doc-update.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ BOT_NAME="pmem-bot"
USER_NAME="pmem"
REPO_NAME="libpmemobj-cpp"

ORIGIN="https://${GITHUB_TOKEN}@github.com/${BOT_NAME}/${REPO_NAME}"
ORIGIN="https://${DOC_UPDATE_GITHUB_TOKEN}@github.com/${BOT_NAME}/${REPO_NAME}"
UPSTREAM="https://github.com/pmem/${REPO_NAME}"
# master or stable-* branch
TARGET_BRANCH=${CI_BRANCH}
Expand Down

0 comments on commit 3d9dcf5

Please sign in to comment.