Skip to content

cicd: move all cicd code into a Makefile #740

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Oct 13, 2025
Merged

cicd: move all cicd code into a Makefile #740

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3b5780b
cicd: move all cicd code into a Makefile
dkropachev Oct 7, 2025
65f0803
Add Makefile section to README-dev.md
dkropachev Oct 13, 2025
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
15 changes: 3 additions & 12 deletions .github/workflows/re-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
inputs:
version_tag:
type: string
description: ''
description: 'version or tag to release it again'
required: true

jobs:
Expand All @@ -16,9 +16,6 @@ jobs:
permissions:
contents: write

env:
MVNCMD: mvn -B -X -ntp

steps:
- name: Checkout Repository
uses: actions/checkout@v5
Expand All @@ -44,20 +41,14 @@ jobs:
git config user.name "ScyllaDB Promoter"
git config user.email "[email protected]"

- name: Clean project
run: $MVNCMD clean

- name: Clean release
run: $MVNCMD release:clean

- name: Prepare release
env:
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
run: $MVNCMD release:prepare -DskipTests -Darguments="-DskipTests" -DpushChanges=false -Dgpg.passphrase=${{ secrets.GPG_PASSPHRASE }}
run: make release-prepare

- name: Perform release
env:
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
run: $MVNCMD release:perform -DscmSkip=true -Dgpg.passphrase=${{ secrets.GPG_PASSPHRASE }}
run: make release
18 changes: 13 additions & 5 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
inputs:
dryrun:
type: boolean
description: 'dryrun: run without pushing SCM changes to upstream'
description: 'dryrun: run without publishing the package'
default: true

jobs:
Expand Down Expand Up @@ -47,18 +47,26 @@ jobs:
- name: Prepare release
env:
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
run: $MVNCMD release:prepare -DpushChanges=false -Dgpg.passphrase=${{ secrets.GPG_PASSPHRASE }}
run: make release-prepare

- name: Perform release
env:
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
if: ${{ github.event.inputs.dryrun == 'false' }}
run: $MVNCMD release:perform -Dgpg.passphrase=${{ secrets.GPG_PASSPHRASE }}
if: ${{ github.event.inputs.dryrun == false }}
run: make release

- name: Perform dry-run release
env:
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
if: ${{ github.event.inputs.dryrun == true }}
run: make release-dry-run

- name: Push changes to SCM
if: ${{ github.event.inputs.dryrun == 'false' }}
if: ${{ github.event.inputs.dryrun == false }}
run: |
git status && git log -3
git push origin --follow-tags -v
85 changes: 25 additions & 60 deletions .github/workflows/[email protected]
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,19 +61,12 @@ jobs:
path: ~/.m2/repository
key: ${{ runner.os }}-${{ matrix.java-version }}-maven-${{ steps.get-pom-hash.outputs.value }}

- name: Install guava-shaded
run: mvn install -pl guava-shaded

- name: Compile source and tests
run: mvn -B compile test-compile -Dfmt.skip=true -Dclirr.skip=true -Danimal.sniffer.skip=true
run: make compile-all

- name: Download test dependencies
if: steps.java-cache.outputs.cache-hit != 'true'
run: mvn -B test -Dtest=TestThatDoesNotExists -Dfmt.skip=true -Dclirr.skip=true -Danimal.sniffer.skip=true || true

- name: Download verify dependencies
if: steps.java-cache.outputs.cache-hit != 'true'
run: mvn -B verify -DskipTests || true
run: make download-all-dependencies

- name: Save maven repository cache
uses: actions/cache/save@v4
Expand Down Expand Up @@ -109,8 +102,7 @@ jobs:
key: ${{ runner.os }}-${{ matrix.java-version }}-maven-${{ hashFiles('**/pom.xml') }}

- name: Full verify
run: mvn -B verify -DskipTests

run: make check

unit-tests:
name: Unit tests
Expand Down Expand Up @@ -138,11 +130,8 @@ jobs:
path: ~/.m2/repository
key: ${{ runner.os }}-${{ matrix.java-version }}-maven-${{ hashFiles('**/pom.xml') }}

- name: Install guava-shaded
run: mvn install -pl guava-shaded

- name: Run unit tests
run: mvn -B test -Dfmt.skip=true -Dclirr.skip=true -Danimal.sniffer.skip=true
run: make test-unit

- name: Copy test results
if: always()
Expand Down Expand Up @@ -192,7 +181,7 @@ jobs:

strategy:
matrix:
cassandra-version: [RELEASE-3.X, RELEASE-4.X]
cassandra-version: [3-LATEST, 4-LATEST]
java-version: [8]
fail-fast: false

Expand All @@ -218,19 +207,13 @@ jobs:
python-version: '3.13'

- name: Setup environment
run: |
pip3 install https://github.com/scylladb/scylla-ccm/archive/master.zip
run: make install-cassandra-ccm

- name: Get cassandra version
id: cassandra-version
run: |
if [[ "${{ matrix.cassandra-version }}" == "RELEASE-3.X" ]]; then
echo "value=$(python3 ci/version_fetch.py --version-index 1 cassandra3-stable:1 | tr -d '\"')" >> $GITHUB_OUTPUT
elif [[ "${{ matrix.cassandra-version }}" == "RELEASE-4.X" ]]; then
echo "value=$(python3 ci/version_fetch.py --version-index 1 cassandra4-stable:1 | tr -d '\"')" >> $GITHUB_OUTPUT
else
echo "Unknown cassandra version name `${{ matrix.cassandra-version }}`"
fi
env:
CASSANDRA_VERSION: ${{ matrix.cassandra-version }}
run: make resolve-cassandra-version

- name: Pull CCM image from the cache
uses: actions/cache/restore@v4
Expand All @@ -241,11 +224,9 @@ jobs:

- name: Download Cassandra (${{ steps.cassandra-version.outputs.value }}) image
if: steps.ccm-cache.outputs.cache-hit != 'true'
run: |
rm -rf /tmp/download.ccm || true
mkdir /tmp/download.ccm || true
ccm create ccm_1 -i 127.0.1. -n 3:0 -v "${{ steps.cassandra-version.outputs.value }}" --config-dir=/tmp/download.ccm
rm -rf /tmp/download.ccm
env:
CASSANDRA_VERSION_RESOLVED: ${{ steps.cassandra-version.outputs.value }}
run: make download-cassandra

- name: Save CCM image into the cache
if: steps.ccm-cache.outputs.cache-hit != 'true'
Expand All @@ -256,7 +237,9 @@ jobs:

- name: Run integration tests on Cassandra (${{ steps.cassandra-version.outputs.value }})
id: run-integration-tests
run: mvn -B -e verify -Dccm.version=${{ steps.cassandra-version.outputs.value }} -Dfmt.skip=true -Dclirr.skip=true -Danimal.sniffer.skip=true
env:
CASSANDRA_VERSION_RESOLVED: ${{ steps.cassandra-version.outputs.value }}
run: make test-integration-cassandra

- name: Copy test results
if: steps.run-integration-tests.outcome == 'failure'
Expand Down Expand Up @@ -299,7 +282,7 @@ jobs:

strategy:
matrix:
scylla-version: [ENTERPRISE-RELEASE, ENTERPRISE-PRIOR-RELEASE, OSS-RELEASE, OSS-PRIOR-RELEASE]
scylla-version: [LTS-LATEST, LTS-PRIOR, LATEST]
java-version: [8]
fail-fast: false

Expand All @@ -324,30 +307,12 @@ jobs:
with:
python-version: '3.13'

- name: Setup environment
run: |
pip3 install https://github.com/scylladb/scylla-ccm/archive/master.zip
sudo sh -c "echo 2097152 > /proc/sys/fs/aio-max-nr"
- name: Install CCM
run: make install-scylla-ccm

- name: Get scylla version
id: scylla-version
run: |
if [[ "${{ matrix.scylla-version }}" == "ENTERPRISE-RELEASE" ]]; then
echo "value=$(python3 ci/version_fetch.py --version-index 1 scylla-enterprise-stable:1 | tr -d '\"')" >> $GITHUB_OUTPUT
elif [[ "${{ matrix.scylla-version }}" == "ENTERPRISE-PRIOR-RELEASE" ]]; then
echo "value=$(python3 ci/version_fetch.py --version-index 2 scylla-enterprise-stable:2 | tr -d '\"')" >> $GITHUB_OUTPUT
elif [[ "${{ matrix.scylla-version }}" == "ENTERPRISE-RC" ]]; then
echo "value=$(python3 ci/version_fetch.py --version-index 1 scylla-enterprise-rc | tr -d '\"')" >> $GITHUB_OUTPUT
elif [[ "${{ matrix.scylla-version }}" == "OSS-RELEASE" ]]; then
echo "value=$(python3 ci/version_fetch.py --version-index 1 scylla-oss-stable:1 | tr -d '\"')" >> $GITHUB_OUTPUT
elif [[ "${{ matrix.scylla-version }}" == "OSS-PRIOR-RELEASE" ]]; then
echo "value=$(python3 ci/version_fetch.py --version-index 2 scylla-oss-stable:2 | tr -d '\"')" >> $GITHUB_OUTPUT
elif [[ "${{ matrix.scylla-version }}" == "OSS-RC" ]]; then
echo "value=$(python3 ci/version_fetch.py --version-index 1 scylla-oss-rc | tr -d '\"')" >> $GITHUB_OUTPUT
else
echo "Unknown scylla version name `${{ matrix.scylla-version }}`"
exit 1
fi
run: make resolve-scylla-version

- name: Pull CCM image from the cache
uses: actions/cache/restore@v4
Expand All @@ -358,11 +323,9 @@ jobs:

- name: Download Scylla (${{ steps.scylla-version.outputs.value }}) image
if: steps.ccm-cache.outputs.cache-hit != 'true'
run: |
rm -rf /tmp/download.ccm || true
mkdir /tmp/download.ccm || true
ccm create ccm_1 -i 127.0.1. -n 3:0 -v "release:${{ steps.scylla-version.outputs.value }}" --scylla --config-dir=/tmp/download.ccm
rm -rf /tmp/download.ccm
env:
SCYLLA_VERSION_RESOLVED: ${{ steps.scylla-version.outputs.value }}
run: make download-scylla

- name: Save CCM image into the cache
uses: actions/cache/save@v4
Expand All @@ -373,7 +336,9 @@ jobs:

- name: Run integration tests on Scylla (${{ steps.scylla-version.outputs.value }})
id: run-integration-tests
run: mvn -B verify -Dccm.version=${{ steps.scylla-version.outputs.value }} -Dccm.distribution=scylla -Dfmt.skip=true -Dclirr.skip=true -Danimal.sniffer.skip=true
env:
SCYLLA_VERSION_RESOLVED: ${{ steps.scylla-version.outputs.value }}
run: make test-integration-scylla

- name: Copy test results
if: steps.run-integration-tests.outcome == 'failure'
Expand Down
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ docs/_build
docs/_source
html
latex
bin/

.java-version
.flattened-pom.xml
Expand Down
Loading
Loading