Skip to content

Commit 9791dd8

Browse files
committed
Merge branch 'master' into killpg
2 parents 09ad7f5 + 879608f commit 9791dd8

Some content is hidden

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

42 files changed

+1946
-284
lines changed

.github/workflows/test-devel.yml

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1116,6 +1116,21 @@ jobs:
11161116
cache-on-failure: true
11171117
workspaces: sable -> target
11181118
- run: rustc --version
1119+
- name: setup pg_hba
1120+
run: 'echo "host all all all trust" | sudo tee -a /etc/postgresql/*/main/pg_hba.conf
1121+
1122+
'
1123+
- name: start postgresql
1124+
run: sudo systemctl start postgresql.service
1125+
- name: set postgresql password
1126+
run: 'sudo -u postgres psql -c "ALTER USER postgres PASSWORD ''postgres''"
1127+
1128+
'
1129+
- name: check postgresql password
1130+
run: 'PGPASSWORD=postgres psql -h localhost -U postgres -d postgres -c "SELECT
1131+
1;"
1132+
1133+
'
11191134
- name: Build Sable
11201135
run: |
11211136
cd $GITHUB_WORKSPACE/sable/
@@ -1129,7 +1144,9 @@ jobs:
11291144
- env:
11301145
IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
11311146
name: Test with pytest
1132-
run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH PATH=$GITHUB_WORKSPACE/sable/target/debug/sbin:$GITHUB_WORKSPACE/sable/target/debug/bin:$GITHUB_WORKSPACE/sable/target/debug:$PATH
1147+
run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH
1148+
IRCTEST_POSTGRESQL_URL=postgresql://postgres:postgres@localhost IRCTEST_DEBUG_LOGS=1
1149+
PATH=$GITHUB_WORKSPACE/sable/target/debug/sbin:$GITHUB_WORKSPACE/sable/target/debug/bin:$GITHUB_WORKSPACE/sable/target/debug:$PATH
11331150
make sable
11341151
timeout-minutes: 30
11351152
- if: always()

.github/workflows/test-stable.yml

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1281,7 +1281,7 @@ jobs:
12811281
uses: actions/checkout@v4
12821282
with:
12831283
path: sable
1284-
ref: 81544475edd03a4e17bf21130a645827fb0e28d4
1284+
ref: 70e61b4cc015537d8906da5286f062a8199fb432
12851285
repository: Libera-Chat/sable
12861286
submodules: ''
12871287
- name: Install rust toolchain
@@ -1296,6 +1296,21 @@ jobs:
12961296
cache-on-failure: true
12971297
workspaces: sable -> target
12981298
- run: rustc --version
1299+
- name: setup pg_hba
1300+
run: 'echo "host all all all trust" | sudo tee -a /etc/postgresql/*/main/pg_hba.conf
1301+
1302+
'
1303+
- name: start postgresql
1304+
run: sudo systemctl start postgresql.service
1305+
- name: set postgresql password
1306+
run: 'sudo -u postgres psql -c "ALTER USER postgres PASSWORD ''postgres''"
1307+
1308+
'
1309+
- name: check postgresql password
1310+
run: 'PGPASSWORD=postgres psql -h localhost -U postgres -d postgres -c "SELECT
1311+
1;"
1312+
1313+
'
12991314
- name: Build Sable
13001315
run: |
13011316
cd $GITHUB_WORKSPACE/sable/
@@ -1309,7 +1324,9 @@ jobs:
13091324
- env:
13101325
IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
13111326
name: Test with pytest
1312-
run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH PATH=$GITHUB_WORKSPACE/sable/target/debug/sbin:$GITHUB_WORKSPACE/sable/target/debug/bin:$GITHUB_WORKSPACE/sable/target/debug:$PATH
1327+
run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH
1328+
IRCTEST_POSTGRESQL_URL=postgresql://postgres:postgres@localhost IRCTEST_DEBUG_LOGS=1
1329+
PATH=$GITHUB_WORKSPACE/sable/target/debug/sbin:$GITHUB_WORKSPACE/sable/target/debug/bin:$GITHUB_WORKSPACE/sable/target/debug:$PATH
13131330
make sable
13141331
timeout-minutes: 30
13151332
- if: always()

0 commit comments

Comments
 (0)