Skip to content

Commit

Permalink
Move to poetry 1.7.1 (#99)
Browse files Browse the repository at this point in the history
Fix linting

Allow non-default branch of synapse
  • Loading branch information
michaelkaye authored Dec 1, 2023
1 parent d044023 commit 75393d8
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 10 deletions.
17 changes: 16 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: "units-test"
on:
workflow_dispatch:
schedule:
- cron: '0 0 * * *'
- cron: '0 0 * * 1'
pull_request:
push:
branches:
Expand All @@ -25,6 +25,21 @@ jobs:
uploadLogs: true
httpPort: 8008

test-poetry-branch:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with:
python-version: ">=3.8"
- name: Run synapse
uses: ./
with:
uploadLogs: true
httpPort: 8008
installer: "poetry"
version: "master"

test-poetry:
runs-on: ubuntu-latest
steps:
Expand Down
9 changes: 5 additions & 4 deletions create.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ async function run() {
let installer = core.getInput("installer");
if (installer == "")
installer = "pip"


if (installer == "poetry") {
// poetry requires a git checkout first
await exec.exec("git", ["clone", "https://github.com/matrix-org/synapse"]);
process.chdir("synapse");
await exec.exec("python", ["-m", "pip", "install","pipx"]);
await exec.exec("python", ["-m", "pipx", "ensurepath"]);
await exec.exec("pipx", ["install", "poetry==1.5.1"]);
await exec.exec("pipx", ["install", "poetry==1.7.1"]);
await exec.exec("pipx", ["list", "--verbose", "--include-injected"]);
await exec.exec("poetry", ["install", "-vv", "--extras", "all"]);
}
else {
Expand Down Expand Up @@ -180,16 +180,17 @@ async function run() {
detached: true,
stdio: [ 'ignore', out, err ]
}
var child;
if (installer == "poetry" ) {
var child = spawn("poetry", [
child = spawn("poetry", [
"run", "python",
"-m", "synapse.app.homeserver",
"--config-path", "homeserver.yaml",
"--config-path", "additional.yaml",
"--config-path", "custom.yaml"
], options);
} else {
var child = spawn("env/bin/python3", [
child = spawn("env/bin/python3", [
"-m", "synapse.app.homeserver",
"--config-path", "homeserver.yaml",
"--config-path", "additional.yaml",
Expand Down
9 changes: 5 additions & 4 deletions dist/create/index.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/create/index.js.map

Large diffs are not rendered by default.

0 comments on commit 75393d8

Please sign in to comment.