Skip to content

Commit 75393d8

Browse files
authored
Move to poetry 1.7.1 (#99)
Fix linting Allow non-default branch of synapse
1 parent d044023 commit 75393d8

File tree

4 files changed

+27
-10
lines changed

4 files changed

+27
-10
lines changed

.github/workflows/test.yml

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: "units-test"
22
on:
33
workflow_dispatch:
44
schedule:
5-
- cron: '0 0 * * *'
5+
- cron: '0 0 * * 1'
66
pull_request:
77
push:
88
branches:
@@ -25,6 +25,21 @@ jobs:
2525
uploadLogs: true
2626
httpPort: 8008
2727

28+
test-poetry-branch:
29+
runs-on: ubuntu-latest
30+
steps:
31+
- uses: actions/checkout@v3
32+
- uses: actions/setup-python@v4
33+
with:
34+
python-version: ">=3.8"
35+
- name: Run synapse
36+
uses: ./
37+
with:
38+
uploadLogs: true
39+
httpPort: 8008
40+
installer: "poetry"
41+
version: "master"
42+
2843
test-poetry:
2944
runs-on: ubuntu-latest
3045
steps:

create.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ async function run() {
1313
let installer = core.getInput("installer");
1414
if (installer == "")
1515
installer = "pip"
16-
1716

1817
if (installer == "poetry") {
1918
// poetry requires a git checkout first
2019
await exec.exec("git", ["clone", "https://github.com/matrix-org/synapse"]);
2120
process.chdir("synapse");
2221
await exec.exec("python", ["-m", "pip", "install","pipx"]);
2322
await exec.exec("python", ["-m", "pipx", "ensurepath"]);
24-
await exec.exec("pipx", ["install", "poetry==1.5.1"]);
23+
await exec.exec("pipx", ["install", "poetry==1.7.1"]);
24+
await exec.exec("pipx", ["list", "--verbose", "--include-injected"]);
2525
await exec.exec("poetry", ["install", "-vv", "--extras", "all"]);
2626
}
2727
else {
@@ -180,16 +180,17 @@ async function run() {
180180
detached: true,
181181
stdio: [ 'ignore', out, err ]
182182
}
183+
var child;
183184
if (installer == "poetry" ) {
184-
var child = spawn("poetry", [
185+
child = spawn("poetry", [
185186
"run", "python",
186187
"-m", "synapse.app.homeserver",
187188
"--config-path", "homeserver.yaml",
188189
"--config-path", "additional.yaml",
189190
"--config-path", "custom.yaml"
190191
], options);
191192
} else {
192-
var child = spawn("env/bin/python3", [
193+
child = spawn("env/bin/python3", [
193194
"-m", "synapse.app.homeserver",
194195
"--config-path", "homeserver.yaml",
195196
"--config-path", "additional.yaml",

dist/create/index.js

Lines changed: 5 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/create/index.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)