Skip to content

Commit 8aa26b2

Browse files
kostasrimkostasrim
committed
Merge branch 'main' into kpr1
2 parents 8f53c94 + 1b0aa56 commit 8aa26b2

File tree

91 files changed

+1786
-645
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+1786
-645
lines changed

‎.github/workflows/ci.yml

+6-24
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ jobs:
1919
with:
2020
fetch-depth: 2
2121
- uses: actions/setup-python@v5
22+
with:
23+
python-version: '3.x'
24+
check-latest: true
2225
- name: Install dependencies
2326
run: |
2427
python -m venv venv
@@ -27,10 +30,6 @@ jobs:
2730
lsblk -l
2831
echo "sda rotational = $(cat /sys/block/sda/queue/rotational)"
2932
echo "sdb rotational = $(cat /sys/block/sdb/queue/rotational)"
30-
- uses: actions/cache@v4
31-
with:
32-
path: ~/.cache/pre-commit
33-
key: pre-commit|${{ env.pythonLocation }}|${{ hashFiles('.pre-commit-config.yaml') }}
3433
- name: Run pre-commit checks
3534
run: |
3635
source venv/bin/activate
@@ -43,7 +42,8 @@ jobs:
4342
container: ["ubuntu-dev:20", "alpine-dev:latest"]
4443
build-type: [Debug, Release]
4544
compiler: [{ cxx: g++, c: gcc }]
46-
cxx_flags: ["-Werror"]
45+
# -no-pie to disable address randomization so we could symbolize stacktraces
46+
cxx_flags: ["-Werror -no-pie"]
4747
sanitizers: ["NoSanitizers"]
4848
include:
4949
- container: "alpine-dev:latest"
@@ -59,12 +59,6 @@ jobs:
5959
sanitizers: "Sanitizers"
6060

6161
runs-on: ubuntu-latest
62-
env:
63-
SCCACHE_GHA_ENABLED: "true"
64-
SCCACHE_CACHE_SIZE: 6G
65-
SCCACHE_ERROR_LOG: /tmp/sccache_log.txt
66-
# SCCACHE_LOG: debug
67-
6862
container:
6963
image: ghcr.io/romange/${{ matrix.container }}
7064
# Seems that docker by default prohibits running iouring syscalls
@@ -99,16 +93,6 @@ jobs:
9993
touch /mnt/foo
10094
ls -la /mnt/foo
10195
102-
- name: Run sccache-cache
103-
uses: mozilla-actions/[email protected]
104-
105-
- name: Configure Cache Env
106-
uses: actions/github-script@v7
107-
with:
108-
script: |
109-
core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
110-
core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '')
111-
11296
- name: Configure CMake
11397
# Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
11498
# See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
@@ -129,14 +113,12 @@ jobs:
129113
export USAN="ON"
130114
fi
131115
132-
# -no-pie to disable address randomization so we could symbolize stacktraces
133116
cmake -B ${GITHUB_WORKSPACE}/build \
134117
-DCMAKE_BUILD_TYPE=${{matrix.build-type}} \
135118
-GNinja \
136119
-DCMAKE_C_COMPILER="${{matrix.compiler.c}}" \
137120
-DCMAKE_CXX_COMPILER="${{matrix.compiler.cxx}}" \
138-
-DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DCMAKE_C_COMPILER_LAUNCHER=sccache \
139-
-DCMAKE_CXX_FLAGS="${{matrix.cxx_flags}} -no-pie" -DWITH_AWS:BOOL=OFF \
121+
-DCMAKE_CXX_FLAGS="${{matrix.cxx_flags}}" -DWITH_AWS:BOOL=OFF \
140122
-DWITH_ASAN="${ASAN}" \
141123
-DWITH_USAN="${USAN}" \
142124
-L

‎.github/workflows/daily-builds.yml

+2-22
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
name: daily-builds
22

33
on:
4-
# TODO: Remove this. This is for testing
54
schedule:
65
- cron: '0 6 * * *' # run at 6 AM UTC
76
workflow_dispatch:
@@ -37,15 +36,6 @@ jobs:
3736
- uses: actions/checkout@v4
3837
with:
3938
submodules: true
40-
- name: Run sccache-cache
41-
uses: mozilla-actions/[email protected]
42-
43-
- name: Configure Cache Env
44-
uses: actions/github-script@v7
45-
with:
46-
script: |
47-
core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
48-
core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '')
4939

5040
- name: Install dependencies
5141
run: |
@@ -59,8 +49,7 @@ jobs:
5949
- name: Configure & Build
6050
run: |
6151
cd $GITHUB_WORKSPACE/build
62-
cmake .. -DCMAKE_BUILD_TYPE=Debug -GNinja -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DCMAKE_C_COMPILER_LAUNCHER=sccache \
63-
${{ matrix.flags }}
52+
cmake .. -DCMAKE_BUILD_TYPE=Debug -GNinja ${{ matrix.flags }}
6453
ninja src/all
6554
- name: Test
6655
run: |
@@ -74,15 +63,6 @@ jobs:
7463
- uses: actions/checkout@v4
7564
with:
7665
submodules: true
77-
- name: Run sccache-cache
78-
uses: mozilla-actions/[email protected]
79-
80-
- name: Configure Cache Env
81-
uses: actions/github-script@v7
82-
with:
83-
script: |
84-
core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
85-
core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '')
8666

8767
- name: Install dependencies
8868
run: |
@@ -114,7 +94,7 @@ jobs:
11494
11595
echo "*************************** START BUILDING **************************************"
11696
CC=gcc-12 CXX=g++-12 cmake .. -DCMAKE_BUILD_TYPE=Debug -GNinja -DWITH_UNWIND=OFF \
117-
-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_FLAGS="-Wl,-ld_classic" \
97+
-DCMAKE_CXX_FLAGS="-Wl,-ld_classic" \
11898
-DCMAKE_C_COMPILER="gcc-12" -DCMAKE_CXX_COMPILER="g++-12"
11999
120100
ninja src/all

‎.github/workflows/mastodon-ruby-tests.yml

+100
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,100 @@
1+
name: Mastodon ruby tests
2+
on:
3+
schedule:
4+
- cron: '0 6 * * *' # run at 6 AM UTC
5+
workflow_dispatch:
6+
7+
8+
jobs:
9+
build-and-test:
10+
runs-on: ubuntu-latest
11+
name: Build and run tests
12+
13+
services:
14+
postgres:
15+
image: postgres:14-alpine
16+
env:
17+
POSTGRES_PASSWORD: postgres
18+
POSTGRES_USER: postgres
19+
options: >-
20+
--health-cmd pg_isready
21+
--health-interval 10ms
22+
--health-timeout 3s
23+
--health-retries 50
24+
ports:
25+
- 5432:5432
26+
27+
redis:
28+
image: docker.dragonflydb.io/dragonflydb/dragonfly:latest
29+
options: >-
30+
--health-cmd "redis-cli ping"
31+
--health-interval 10ms
32+
--health-timeout 3s
33+
--health-retries 50
34+
ports:
35+
- 6379:6379
36+
37+
env:
38+
DB_HOST: localhost
39+
DB_USER: postgres
40+
DB_PASS: postgres
41+
RAILS_ENV: test
42+
ALLOW_NOPAM: true
43+
PAM_ENABLED: true
44+
PAM_DEFAULT_SERVICE: pam_test
45+
PAM_CONTROLLED_SERVICE: pam_test_controlled
46+
OIDC_ENABLED: true
47+
OIDC_SCOPE: read
48+
SAML_ENABLED: true
49+
CAS_ENABLED: true
50+
BUNDLE_WITH: 'pam_authentication test'
51+
GITHUB_RSPEC: false
52+
53+
steps:
54+
- name: Checkout mastodon
55+
uses: actions/checkout@v4
56+
with:
57+
repository: mastodon/mastodon
58+
- name: Install pre-requisites
59+
run: |
60+
sudo apt update
61+
sudo apt install -y libicu-dev libidn11-dev libvips42 ffmpeg imagemagick libpam-dev
62+
- name: Set up Ruby
63+
uses: ruby/setup-ruby@v1
64+
with:
65+
ruby-version: 3.4
66+
bundler-cache: true
67+
- name: Set up Node.js
68+
uses: actions/setup-node@v4
69+
with:
70+
node-version-file: '.nvmrc'
71+
- name: Enable corepack
72+
shell: bash
73+
run: corepack enable
74+
- name: Install all production yarn packages
75+
shell: bash
76+
run: yarn workspaces focus --production
77+
- name: Precompile assets
78+
run: |-
79+
bin/rails assets:precompile
80+
- name: Load database schema
81+
run: |
82+
bin/rails db:setup
83+
bin/flatware fan bin/rails db:test:prepare
84+
- name: Run tests
85+
env:
86+
SPEC_OPTS: '--exclude-pattern "**/self_destruct_scheduler_spec.rb"'
87+
run: |
88+
unset COVERAGE
89+
bin/flatware rspec -r ./spec/flatware_helper.rb
90+
- name: Notify on failures
91+
if: failure()
92+
shell: bash
93+
run: |
94+
job_link="${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}"
95+
message="Mastodon ruby tests failed.\\n The commit is: ${{github.sha}}.\\n Job Link: ${job_link}\\n"
96+
curl -s \
97+
-X POST \
98+
-H 'Content-Type: application/json' \
99+
'${{ secrets.GSPACES_BOT_DF_BUILD }}' \
100+
-d '{"text": "'"${message}"'"}'

‎README.ko-KR.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ Dragonfly는 유휴 상태에서 Redis보다 메모리 효율이 30% 더 좋았
8585

8686
Dragonfly는 스냅샷 단계를 몇 초안에 더 빨리 마쳤습니다.
8787

88-
Dragonfly의 메모리 효율에 대한 정보가 더 필요하시다면, 저희의 [Dastable 문서](/docs/dashtable.md)를 참고하시기 바랍니다.
88+
Dragonfly의 메모리 효율에 대한 정보가 더 필요하시다면, 저희의 [Dashtable 문서](/docs/dashtable.md)를 참고하시기 바랍니다.
8989

9090

9191
## <a name="configuration"><a/>설정

‎contrib/charts/dragonfly/Chart.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ type: application
1515
# This is the chart version. This version number should be incremented each time you make changes
1616
# to the chart and its templates, including the app version.
1717
# Versions are expected to follow Semantic Versioning (https://semver.org/)
18-
version: v1.28.1
18+
version: v1.29.0
1919

2020
# This is the version number of the application being deployed. This version number should be
2121
# incremented each time you make changes to the application. Versions are not expected to
2222
# follow Semantic Versioning. They should reflect the version the application is using.
2323
# It is recommended to use it with quotes.
24-
appVersion: "v1.28.1"
24+
appVersion: "v1.29.0"
2525

2626
home: https://dragonflydb.io/
2727

‎contrib/charts/dragonfly/ci/affinity-values.golden.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ metadata:
88
labels:
99
app.kubernetes.io/name: dragonfly
1010
app.kubernetes.io/instance: test
11-
app.kubernetes.io/version: "v1.28.1"
11+
app.kubernetes.io/version: "v1.29.0"
1212
app.kubernetes.io/managed-by: Helm
1313
---
1414
# Source: dragonfly/templates/service.yaml
@@ -20,7 +20,7 @@ metadata:
2020
labels:
2121
app.kubernetes.io/name: dragonfly
2222
app.kubernetes.io/instance: test
23-
app.kubernetes.io/version: "v1.28.1"
23+
app.kubernetes.io/version: "v1.29.0"
2424
app.kubernetes.io/managed-by: Helm
2525
spec:
2626
type: ClusterIP
@@ -42,7 +42,7 @@ metadata:
4242
labels:
4343
app.kubernetes.io/name: dragonfly
4444
app.kubernetes.io/instance: test
45-
app.kubernetes.io/version: "v1.28.1"
45+
app.kubernetes.io/version: "v1.29.0"
4646
app.kubernetes.io/managed-by: Helm
4747
spec:
4848
replicas: 1
@@ -72,7 +72,7 @@ spec:
7272
serviceAccountName: test-dragonfly
7373
containers:
7474
- name: dragonfly
75-
image: "docker.dragonflydb.io/dragonflydb/dragonfly:v1.28.1"
75+
image: "docker.dragonflydb.io/dragonflydb/dragonfly:v1.29.0"
7676
imagePullPolicy: IfNotPresent
7777
ports:
7878
- name: dragonfly

‎contrib/charts/dragonfly/ci/command_extraargs-values.golden.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ metadata:
88
labels:
99
app.kubernetes.io/name: dragonfly
1010
app.kubernetes.io/instance: test
11-
app.kubernetes.io/version: "v1.28.1"
11+
app.kubernetes.io/version: "v1.29.0"
1212
app.kubernetes.io/managed-by: Helm
1313
---
1414
# Source: dragonfly/templates/service.yaml
@@ -20,7 +20,7 @@ metadata:
2020
labels:
2121
app.kubernetes.io/name: dragonfly
2222
app.kubernetes.io/instance: test
23-
app.kubernetes.io/version: "v1.28.1"
23+
app.kubernetes.io/version: "v1.29.0"
2424
app.kubernetes.io/managed-by: Helm
2525
spec:
2626
type: ClusterIP
@@ -42,7 +42,7 @@ metadata:
4242
labels:
4343
app.kubernetes.io/name: dragonfly
4444
app.kubernetes.io/instance: test
45-
app.kubernetes.io/version: "v1.28.1"
45+
app.kubernetes.io/version: "v1.29.0"
4646
app.kubernetes.io/managed-by: Helm
4747
spec:
4848
replicas: 1
@@ -60,7 +60,7 @@ spec:
6060
serviceAccountName: test-dragonfly
6161
containers:
6262
- name: dragonfly
63-
image: "docker.dragonflydb.io/dragonflydb/dragonfly:v1.28.1"
63+
image: "docker.dragonflydb.io/dragonflydb/dragonfly:v1.29.0"
6464
imagePullPolicy: IfNotPresent
6565
ports:
6666
- name: dragonfly

‎contrib/charts/dragonfly/ci/extracontainer-string-values.golden.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ metadata:
88
labels:
99
app.kubernetes.io/name: dragonfly
1010
app.kubernetes.io/instance: test
11-
app.kubernetes.io/version: "v1.28.1"
11+
app.kubernetes.io/version: "v1.29.0"
1212
app.kubernetes.io/managed-by: Helm
1313
---
1414
# Source: dragonfly/templates/service.yaml
@@ -20,7 +20,7 @@ metadata:
2020
labels:
2121
app.kubernetes.io/name: dragonfly
2222
app.kubernetes.io/instance: test
23-
app.kubernetes.io/version: "v1.28.1"
23+
app.kubernetes.io/version: "v1.29.0"
2424
app.kubernetes.io/managed-by: Helm
2525
spec:
2626
type: ClusterIP
@@ -42,7 +42,7 @@ metadata:
4242
labels:
4343
app.kubernetes.io/name: dragonfly
4444
app.kubernetes.io/instance: test
45-
app.kubernetes.io/version: "v1.28.1"
45+
app.kubernetes.io/version: "v1.29.0"
4646
app.kubernetes.io/managed-by: Helm
4747
spec:
4848
replicas: 1
@@ -67,7 +67,7 @@ spec:
6767
image: busybox:latest
6868
name: sidecar-string
6969
- name: dragonfly
70-
image: "docker.dragonflydb.io/dragonflydb/dragonfly:v1.28.1"
70+
image: "docker.dragonflydb.io/dragonflydb/dragonfly:v1.29.0"
7171
imagePullPolicy: IfNotPresent
7272
ports:
7373
- name: dragonfly

0 commit comments

Comments
 (0)