slipenkomk/valkey
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Format yaml files (#615)

Browse Source 
Closes #533

---------

Signed-off-by: adetunjii <adetunjithomas1@outlook.com>
This commit is contained in:
Samuel Adetunji 2024-06-14 21:40:06 +01:00 committed by GitHub
parent 6faa48a358
commit 93123f97a0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
13 changed files with 956 additions and 920 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.config/format.yml Normal file
View File

@ -0,0 +1,7 @@
formatter:
type: basic
indent: 2
retain_line_breaks_single: true
exclude:
- "deps/"

1
.github/dependabot.yml vendored
View File

@ -2,7 +2,6 @@
# package ecosystems to update and where the package manifests are located. # package ecosystems to update and where the package manifests are located.
# Please see the documentation for all configuration options: # Please see the documentation for all configuration options:
# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates # https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
---
version: 2 version: 2
updates: updates:
- package-ecosystem: github-actions - package-ecosystem: github-actions

30
.github/workflows/build-release-packages.yml vendored
View File

@ -3,7 +3,7 @@ name: Build Release Packages
on: on:
release: release:
types: [published] types: [published]
workflow_dispatch: workflow_dispatch:
inputs: inputs:
version: version:
@ -44,20 +44,20 @@ jobs:
INPUT_VERSION: ${{ inputs.version || github.ref_name }} INPUT_VERSION: ${{ inputs.version || github.ref_name }}
generate-build-matrix: generate-build-matrix:
name: Generating build matrix name: Generating build matrix
runs-on: ubuntu-latest runs-on: ubuntu-latest
outputs: outputs:
x86_64-build-matrix: ${{ steps.set-matrix.outputs.x86_64-build-matrix }} x86_64-build-matrix: ${{ steps.set-matrix.outputs.x86_64-build-matrix }}
arm64-build-matrix: ${{ steps.set-matrix.outputs.arm64-build-matrix }} arm64-build-matrix: ${{ steps.set-matrix.outputs.arm64-build-matrix }}
steps: steps:
- name: Checkout repository - name: Checkout repository
uses: actions/checkout@v4 uses: actions/checkout@v4
# Set up the list of target to build so we can pass the JSON to the reusable job # Set up the list of target to build so we can pass the JSON to the reusable job
- uses: ./.github/actions/generate-package-build-matrix - uses: ./.github/actions/generate-package-build-matrix
id: set-matrix id: set-matrix
with: with:
ref: ${{ inputs.version || github.ref_name }} ref: ${{ inputs.version || github.ref_name }}
release-build-linux-x86-packages: release-build-linux-x86-packages:
needs: needs:
- release-build-get-meta - release-build-get-meta

6
.github/workflows/call-build-linux-arm-packages.yml vendored
View File

@ -45,7 +45,7 @@ jobs:
uses: actions/checkout@v4 uses: actions/checkout@v4
with: with:
ref: ${{ inputs.version }} ref: ${{ inputs.version }}
- name: Make Valkey - name: Make Valkey
uses: uraimo/run-on-arch-action@v2 uses: uraimo/run-on-arch-action@v2
with: with:
@ -53,7 +53,7 @@ jobs:
distro: ${{matrix.distro.target}} distro: ${{matrix.distro.target}}
install: apt-get update && apt-get install -y build-essential libssl-dev install: apt-get update && apt-get install -y build-essential libssl-dev
run: make -C src all BUILD_TLS=yes run: make -C src all BUILD_TLS=yes
- name: Create Tarball and SHA256sums - name: Create Tarball and SHA256sums
run: | run: |
TAR_FILE_NAME=valkey-${{inputs.version}}-${{matrix.distro.platform}}-${{ matrix.distro.arch}} TAR_FILE_NAME=valkey-${{inputs.version}}-${{matrix.distro.platform}}-${{ matrix.distro.arch}}
@ -64,7 +64,7 @@ jobs:
sha256sum $TAR_FILE_NAME.tar.gz > $TAR_FILE_NAME.tar.gz.sha256 sha256sum $TAR_FILE_NAME.tar.gz > $TAR_FILE_NAME.tar.gz.sha256
mkdir -p packages-files mkdir -p packages-files
cp -rfv $TAR_FILE_NAME.tar* packages-files/ cp -rfv $TAR_FILE_NAME.tar* packages-files/
- name: Install AWS cli. - name: Install AWS cli.
run: | run: |
sudo apt-get install -y awscli sudo apt-get install -y awscli

2
.github/workflows/call-build-linux-x86-packages.yml vendored
View File

@ -51,7 +51,7 @@ jobs:
- name: Make Valkey - name: Make Valkey
run: make -C src all BUILD_TLS=yes run: make -C src all BUILD_TLS=yes
- name: Create Tarball and SHA256sums - name: Create Tarball and SHA256sums
run: | run: |
TAR_FILE_NAME=valkey-${{inputs.version}}-${{matrix.distro.platform}}-${{ matrix.distro.arch}} TAR_FILE_NAME=valkey-${{inputs.version}}-${{matrix.distro.platform}}-${{ matrix.distro.arch}}

119
.github/workflows/ci.yml vendored
View File

@ -6,30 +6,29 @@ permissions:
contents: read contents: read
jobs: jobs:
test-ubuntu-latest: test-ubuntu-latest:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- name: make - name: make
# Fail build if there are warnings # Fail build if there are warnings
# build with TLS just for compilation coverage # build with TLS just for compilation coverage
run: make all-with-unit-tests SERVER_CFLAGS='-Werror' BUILD_TLS=yes run: make all-with-unit-tests SERVER_CFLAGS='-Werror' BUILD_TLS=yes
- name: test - name: test
run: | run: |
sudo apt-get install tcl8.6 tclx sudo apt-get install tcl8.6 tclx
./runtest --verbose --tags -slow --dump-logs ./runtest --verbose --tags -slow --dump-logs
- name: module api test - name: module api test
run: CFLAGS='-Werror' ./runtest-moduleapi --verbose --dump-logs run: CFLAGS='-Werror' ./runtest-moduleapi --verbose --dump-logs
- name: validate commands.def up to date - name: validate commands.def up to date
run: | run: |
touch src/commands/ping.json touch src/commands/ping.json
make commands.def make commands.def
dirty=$(git diff) dirty=$(git diff)
if [[ ! -z $dirty ]]; then echo $dirty; exit 1; fi if [[ ! -z $dirty ]]; then echo $dirty; exit 1; fi
- name: unit tests - name: unit tests
run: | run: |
./src/valkey-unit-tests ./src/valkey-unit-tests
test-sanitizer-address: test-sanitizer-address:
runs-on: ubuntu-latest runs-on: ubuntu-latest
@ -49,43 +48,79 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
container: debian:buster container: debian:buster
steps: steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- name: make - name: make
run: | run: |
apt-get update && apt-get install -y build-essential apt-get update && apt-get install -y build-essential
make SERVER_CFLAGS='-Werror' make SERVER_CFLAGS='-Werror'
build-macos-latest: build-macos-latest:
runs-on: macos-latest runs-on: macos-latest
steps: steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- name: make - name: make
run: make SERVER_CFLAGS='-Werror' run: make SERVER_CFLAGS='-Werror'
build-32bit: build-32bit:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- name: make - name: make
run: | run: |
sudo apt-get update && sudo apt-get install libc6-dev-i386 sudo apt-get update && sudo apt-get install libc6-dev-i386
make SERVER_CFLAGS='-Werror' 32bit make SERVER_CFLAGS='-Werror' 32bit
build-libc-malloc: build-libc-malloc:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- name: make - name: make
run: make SERVER_CFLAGS='-Werror' MALLOC=libc run: make SERVER_CFLAGS='-Werror' MALLOC=libc
build-almalinux8-jemalloc: build-almalinux8-jemalloc:
runs-on: ubuntu-latest runs-on: ubuntu-latest
container: almalinux:8 container: almalinux:8
steps: steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- name: make - name: make
run: | run: |
dnf -y install epel-release gcc make procps-ng which dnf -y install epel-release gcc make procps-ng which
make -j SERVER_CFLAGS='-Werror' make -j SERVER_CFLAGS='-Werror'
format-yaml:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- name: Set up Go
uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
with:
go-version: "1.22.4"
- name: Setup YAML formatter
run: |
go install github.com/google/yamlfmt/cmd/yamlfmt@latest
- name: Run yamlfmt
id: yamlfmt
run: |
yamlfmt -lint -conf .config/format.yml .
# Capture the diff output
DIFF=$(git diff)
if [ ! -z "$DIFF" ]; then
# Encode the diff in Base64 to ensure it's handled as a single line
ENCODED_DIFF=$(echo "$DIFF" | base64 -w 0)
echo "diff=$ENCODED_DIFF" >> $GITHUB_OUTPUT
fi
shell: bash
- name: Check for formatting changes
if: ${{ steps.yamlfmt.outputs.diff }}
run: |
echo "ERROR: YAML file is not formatted properly. Here is the diff: "
# Decode the Base64 diff to display it
echo "${{ steps.clang-format.outputs.diff }}" | base64 --decode
exit 1
shell: bash

68
.github/workflows/clang-format.yml vendored
View File

@ -10,39 +10,39 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Checkout code - name: Checkout code
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- name: Set up Clang - name: Set up Clang
run: | run: |
sudo apt-get update -y sudo apt-get update -y
sudo apt-get upgrade -y sudo apt-get upgrade -y
sudo apt-get install software-properties-common -y sudo apt-get install software-properties-common -y
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | gpg --dearmor | sudo tee /usr/share/keyrings/llvm-toolchain.gpg > /dev/null wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | gpg --dearmor | sudo tee /usr/share/keyrings/llvm-toolchain.gpg > /dev/null
echo "deb [signed-by=/usr/share/keyrings/llvm-toolchain.gpg] http://apt.llvm.org/$(lsb_release -cs)/ llvm-toolchain-$(lsb_release -cs)-18 main" | sudo tee /etc/apt/sources.list.d/llvm.list echo "deb [signed-by=/usr/share/keyrings/llvm-toolchain.gpg] http://apt.llvm.org/$(lsb_release -cs)/ llvm-toolchain-$(lsb_release -cs)-18 main" | sudo tee /etc/apt/sources.list.d/llvm.list
sudo apt-get update -y sudo apt-get update -y
sudo apt-get install clang-format-18 -y sudo apt-get install clang-format-18 -y
- name: Run clang-format - name: Run clang-format
id: clang-format id: clang-format
run: | run: |
# Run clang-format and capture the diff # Run clang-format and capture the diff
cd src cd src
shopt -s globstar shopt -s globstar
clang-format-18 -i **/*.c **/*.h clang-format-18 -i **/*.c **/*.h
# Capture the diff output # Capture the diff output
DIFF=$(git diff) DIFF=$(git diff)
if [ ! -z "$DIFF" ]; then if [ ! -z "$DIFF" ]; then
# Encode the diff in Base64 to ensure it's handled as a single line # Encode the diff in Base64 to ensure it's handled as a single line
ENCODED_DIFF=$(echo "$DIFF" | base64 -w 0) ENCODED_DIFF=$(echo "$DIFF" | base64 -w 0)
echo "diff=$ENCODED_DIFF" >> $GITHUB_OUTPUT echo "diff=$ENCODED_DIFF" >> $GITHUB_OUTPUT
fi fi
shell: bash shell: bash
- name: Check for formatting changes - name: Check for formatting changes
if: ${{ steps.clang-format.outputs.diff }} if: ${{ steps.clang-format.outputs.diff }}
run: | run: |
echo "ERROR: Code is not formatted correctly. Here is the diff:" echo "ERROR: Code is not formatted correctly. Here is the diff:"
# Decode the Base64 diff to display it # Decode the Base64 diff to display it
echo "${{ steps.clang-format.outputs.diff }}" | base64 --decode echo "${{ steps.clang-format.outputs.diff }}" | base64 --decode
exit 1 exit 1
shell: bash shell: bash

22
.github/workflows/codecov.yml vendored
View File

@ -9,16 +9,16 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Checkout repository - name: Checkout repository
uses: actions/checkout@v4 uses: actions/checkout@v4
- name: Install lcov and run test - name: Install lcov and run test
run: | run: |
sudo apt-get install lcov sudo apt-get install lcov
make lcov make lcov
- name: Upload code coverage - name: Upload code coverage
uses: codecov/codecov-action@v4 uses: codecov/codecov-action@v4
with: with:
token: ${{ secrets.CODECOV_TOKEN }} token: ${{ secrets.CODECOV_TOKEN }}
file: ./src/valkey.info file: ./src/valkey.info

22
.github/workflows/codeql-analysis.yml vendored
View File

@ -20,19 +20,19 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
language: [ 'cpp' ] language: ['cpp']
steps: steps:
- name: Checkout repository - name: Checkout repository
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- name: Initialize CodeQL - name: Initialize CodeQL
uses: github/codeql-action/init@1b1aada464948af03b950897e5eb522f92603cc2 # v3.24.9 uses: github/codeql-action/init@1b1aada464948af03b950897e5eb522f92603cc2 # v3.24.9
with: with:
languages: ${{ matrix.language }} languages: ${{ matrix.language }}
- name: Autobuild - name: Autobuild
uses: github/codeql-action/autobuild@1b1aada464948af03b950897e5eb522f92603cc2 # v3.24.9 uses: github/codeql-action/autobuild@1b1aada464948af03b950897e5eb522f92603cc2 # v3.24.9
- name: Perform CodeQL Analysis - name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@1b1aada464948af03b950897e5eb522f92603cc2 # v3.24.9 uses: github/codeql-action/analyze@1b1aada464948af03b950897e5eb522f92603cc2 # v3.24.9

22
.github/workflows/coverity.yml vendored
View File

@ -2,8 +2,8 @@
name: Coverity Scan name: Coverity Scan
on: on:
schedule: schedule:
# Run once daily, since below 500k LOC can have 21 builds per week, per https://scan.coverity.com/faq#frequency # Run once daily, since below 500k LOC can have 21 builds per week, per https://scan.coverity.com/faq#frequency
- cron: '0 0 * * *' - cron: '0 0 * * *'
# Support manual execution # Support manual execution
workflow_dispatch: workflow_dispatch:
permissions: permissions:
@ -13,18 +13,18 @@ jobs:
if: github.repository == 'valkey-io/valkey' if: github.repository == 'valkey-io/valkey'
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- name: Download and extract the Coverity Build Tool - name: Download and extract the Coverity Build Tool
run: | run: |
wget -q https://scan.coverity.com/download/cxx/linux64 --post-data "token=${{ secrets.COVERITY_SCAN_TOKEN }}&project=valkey-io%2Fvalkey" -O cov-analysis-linux64.tar.gz wget -q https://scan.coverity.com/download/cxx/linux64 --post-data "token=${{ secrets.COVERITY_SCAN_TOKEN }}&project=valkey-io%2Fvalkey" -O cov-analysis-linux64.tar.gz
mkdir cov-analysis-linux64 mkdir cov-analysis-linux64
tar xzf cov-analysis-linux64.tar.gz --strip 1 -C cov-analysis-linux64 tar xzf cov-analysis-linux64.tar.gz --strip 1 -C cov-analysis-linux64
- name: Install Valkey dependencies - name: Install Valkey dependencies
run: sudo apt install -y gcc procps libssl-dev run: sudo apt install -y gcc procps libssl-dev
- name: Build with cov-build - name: Build with cov-build
run: cov-analysis-linux64/bin/cov-build --dir cov-int make run: cov-analysis-linux64/bin/cov-build --dir cov-int make
- name: Upload the result - name: Upload the result
run: | run: |
tar czvf cov-int.tgz cov-int tar czvf cov-int.tgz cov-int
curl \ curl \
--form email=${{ secrets.COVERITY_SCAN_EMAIL }} \ --form email=${{ secrets.COVERITY_SCAN_EMAIL }} \

1511
.github/workflows/daily.yml vendored
View File

File diff suppressed because it is too large Load Diff

64
.github/workflows/external.yml vendored
View File

@ -15,53 +15,53 @@ jobs:
if: github.event_name != 'schedule' || github.repository == 'valkey-io/valkey' if: github.event_name != 'schedule' || github.repository == 'valkey-io/valkey'
timeout-minutes: 14400 timeout-minutes: 14400
steps: steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- name: Build - name: Build
run: make SERVER_CFLAGS=-Werror run: make SERVER_CFLAGS=-Werror
- name: Start valkey-server - name: Start valkey-server
run: | run: |
./src/valkey-server --daemonize yes --save "" --logfile external-server.log \ ./src/valkey-server --daemonize yes --save "" --logfile external-server.log \
--enable-protected-configs yes --enable-debug-command yes --enable-module-command yes --enable-protected-configs yes --enable-debug-command yes --enable-module-command yes
- name: Run external test - name: Run external test
run: | run: |
./runtest \ ./runtest \
--host 127.0.0.1 --port 6379 \ --host 127.0.0.1 --port 6379 \
--verbose \ --verbose \
--tags -slow --tags -slow
- name: Archive server log - name: Archive server log
if: ${{ failure() }} if: ${{ failure() }}
uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3 uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
with: with:
name: test-external-standalone-log name: test-external-standalone-log
path: external-server.log path: external-server.log
test-external-cluster: test-external-cluster:
runs-on: ubuntu-latest runs-on: ubuntu-latest
if: github.event_name != 'schedule' || github.repository == 'valkey-io/valkey' if: github.event_name != 'schedule' || github.repository == 'valkey-io/valkey'
timeout-minutes: 14400 timeout-minutes: 14400
steps: steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- name: Build - name: Build
run: make SERVER_CFLAGS=-Werror run: make SERVER_CFLAGS=-Werror
- name: Start valkey-server - name: Start valkey-server
run: | run: |
./src/valkey-server --cluster-enabled yes --daemonize yes --save "" --logfile external-server.log \ ./src/valkey-server --cluster-enabled yes --daemonize yes --save "" --logfile external-server.log \
--enable-protected-configs yes --enable-debug-command yes --enable-module-command yes --enable-protected-configs yes --enable-debug-command yes --enable-module-command yes
- name: Create a single node cluster - name: Create a single node cluster
run: ./src/valkey-cli cluster addslots $(for slot in {0..16383}; do echo $slot; done); sleep 5 run: ./src/valkey-cli cluster addslots $(for slot in {0..16383}; do echo $slot; done); sleep 5
- name: Run external test - name: Run external test
run: | run: |
./runtest \ ./runtest \
--host 127.0.0.1 --port 6379 \ --host 127.0.0.1 --port 6379 \
--verbose \ --verbose \
--cluster-mode \ --cluster-mode \
--tags -slow --tags -slow
- name: Archive server log - name: Archive server log
if: ${{ failure() }} if: ${{ failure() }}
uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3 uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
with: with:
name: test-external-cluster-log name: test-external-cluster-log
path: external-server.log path: external-server.log
test-external-nodebug: test-external-nodebug:
runs-on: ubuntu-latest runs-on: ubuntu-latest

2
codecov.yml
View File

@ -16,4 +16,4 @@ comment:
behavior: default behavior: default
github_checks: github_checks:
annotations: false annotations: false