Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/evansmj/lightning into ev…
Browse files Browse the repository at this point in the history
…ansmj/bugfix-find-onchain-fees-bkpr-inspect
  • Loading branch information
evansmj committed Jan 16, 2024
2 parents 7afb840 + 3cbe35e commit 4699182
Show file tree
Hide file tree
Showing 19 changed files with 1,142 additions and 132 deletions.
12 changes: 7 additions & 5 deletions .github/workflows/pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,29 +61,31 @@ jobs:
WORKDIR: ${{ matrix.WORKDIR }}
run: |
export VERSION=$(git describe --abbrev=0).post$(git describe --abbrev=1 | awk -F "-" '{print $2}')
cd ${{ env.WORKDIR}}
cd ${{ env.WORKDIR }}
make upgrade-version NEW_VERSION=$VERSION
poetry build
poetry build --no-interaction
- name: Publish distribution 📦 to Test PyPI
if: github.repository == 'ElementsProject/lightning' && github.ref == "refs/heads/master"
env:
POETRY_PYPI_TOKEN_TESTPYPI: ${{ secrets.TEST_PYPI_API_TOKEN }}
WORKDIR: ${{ matrix.WORKDIR }}
run: |
cd ${{ env.WORKDIR}}
cd ${{ env.WORKDIR }}
python3 -m pip config set global.timeout 150
poetry config repositories.testpypi https://test.pypi.org/legacy/
poetry build --no-interaction
poetry publish --repository testpypi --no-interaction --skip-existing
- name: Publish distribution 📦 to PyPI
if: startsWith(github.ref, 'refs/tags') && github.repository == 'ElementsProject/lightning'
if: startsWith(github.ref, 'refs/tags/v') && github.repository == 'ElementsProject/lightning'
env:
POETRY_PYPI_TOKEN_PYPI: ${{ secrets.PYPI_API_TOKEN }}
WORKDIR: ${{ matrix.WORKDIR }}
run: |
cd ${{ env.WORKDIR}}
cd ${{ env.WORKDIR }}
export VERSION=$(git describe --abbrev=0)
make upgrade-version NEW_VERSION=$VERSION
python3 -m pip config set global.timeout 150
poetry build --no-interaction
poetry publish --no-interaction
14 changes: 14 additions & 0 deletions Cargo.lock

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

1 change: 1 addition & 0 deletions cln-rpc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,4 @@ tokio-util = { version = "0.7", features = ["codec"] }
[dev-dependencies]
env_logger = "0.10"
tokio = { version = "1", features = ["net", "macros", "rt-multi-thread"]}
tokio-test = "0.4.3"
Loading

0 comments on commit 4699182

Please sign in to comment.