From f9d068cf2c02b0d1aac4f5f1e9c9a1cbdcfb5845 Mon Sep 17 00:00:00 2001 From: ben Date: Sat, 28 Jan 2023 21:48:27 +0000 Subject: [PATCH 1/5] Forces featured first --- lnbits/core/templates/core/install.html | 1 + 1 file changed, 1 insertion(+) diff --git a/lnbits/core/templates/core/install.html b/lnbits/core/templates/core/install.html index d9f61844..fe6ed6e8 100644 --- a/lnbits/core/templates/core/install.html +++ b/lnbits/core/templates/core/install.html @@ -477,6 +477,7 @@ inProgress: false })) this.filteredExtensions = this.extensions.concat([]) + this.handleTabChanged("featured") }, mixins: [windowMixin] }) From 7ea3d6c245767615dc28c40a697fd8e821117d2f Mon Sep 17 00:00:00 2001 From: ben Date: Sat, 28 Jan 2023 21:53:00 +0000 Subject: [PATCH 2/5] format --- lnbits/core/templates/core/install.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lnbits/core/templates/core/install.html b/lnbits/core/templates/core/install.html index fe6ed6e8..19056f7c 100644 --- a/lnbits/core/templates/core/install.html +++ b/lnbits/core/templates/core/install.html @@ -477,7 +477,7 @@ inProgress: false })) this.filteredExtensions = this.extensions.concat([]) - this.handleTabChanged("featured") + this.handleTabChanged('featured') }, mixins: [windowMixin] }) From ff3f86afa62a98a388ea283eda58176a82474861 Mon Sep 17 00:00:00 2001 From: calle <93376500+callebtc@users.noreply.github.com> Date: Sun, 29 Jan 2023 11:25:43 +0100 Subject: [PATCH 3/5] fix gitignore (#1429) --- .gitignore | 2 -- 1 file changed, 2 deletions(-) diff --git a/.gitignore b/.gitignore index 3b0b00ba..5feb2737 100644 --- a/.gitignore +++ b/.gitignore @@ -40,6 +40,4 @@ docker # Nix *result* -# Ignore extensions (post installable extension PR) -extensions/ upgrades/ \ No newline at end of file From b2a963638d62d7ddcc5d4c991e28e0bae6ad3ac2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?dni=20=E2=9A=A1?= Date: Sun, 29 Jan 2023 11:46:20 +0100 Subject: [PATCH 4/5] TEST: update actions setup-python to v4 and checkout to v3, add caching to python (#1428) * update actions setup-python to v4 and checkout to v3, add caching to python * fix ordering of steps for poetry to be cached * poetry setup ordering * order in formatting.yml --- .github/workflows/codeql.yml | 2 +- .github/workflows/formatting.yml | 12 +++---- .github/workflows/migrations.yml | 5 ++- .github/workflows/mypy.yml | 12 +++---- .github/workflows/on-tag.yml | 4 +-- .github/workflows/regtest.yml | 61 ++++++++++++++++---------------- .github/workflows/tests.yml | 28 +++++++-------- 7 files changed, 62 insertions(+), 62 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 876c8b8a..3d2fb213 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: fetch-depth: 2 - run: git checkout HEAD^2 diff --git a/.github/workflows/formatting.yml b/.github/workflows/formatting.yml index 18445899..709ebcb3 100644 --- a/.github/workflows/formatting.yml +++ b/.github/workflows/formatting.yml @@ -14,18 +14,18 @@ jobs: python-version: ["3.9"] poetry-version: ["1.3.1"] steps: - - uses: actions/checkout@v2 - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 - with: - python-version: ${{ matrix.python-version }} + - uses: actions/checkout@v3 - name: Set up Poetry ${{ matrix.poetry-version }} uses: abatilo/actions-poetry@v2 with: poetry-version: ${{ matrix.poetry-version }} + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v4 + with: + python-version: ${{ matrix.python-version }} + cache: "poetry" - name: Install packages run: | - poetry config virtualenvs.create false poetry install - name: Check black run: make checkblack diff --git a/.github/workflows/migrations.yml b/.github/workflows/migrations.yml index 6725d845..03a9d761 100644 --- a/.github/workflows/migrations.yml +++ b/.github/workflows/migrations.yml @@ -25,9 +25,9 @@ jobs: python-version: ["3.9"] poetry-version: ["1.3.1"] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} - name: Set up Poetry ${{ matrix.poetry-version }} @@ -36,7 +36,6 @@ jobs: poetry-version: ${{ matrix.poetry-version }} - name: Install dependencies run: | - poetry config virtualenvs.create false poetry install sudo apt install unzip - name: Run migrations diff --git a/.github/workflows/mypy.yml b/.github/workflows/mypy.yml index 4c47fafc..ad5be69d 100644 --- a/.github/workflows/mypy.yml +++ b/.github/workflows/mypy.yml @@ -10,18 +10,18 @@ jobs: python-version: ["3.9"] poetry-version: ["1.3.1"] steps: - - uses: actions/checkout@v2 - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 - with: - python-version: ${{ matrix.python-version }} + - uses: actions/checkout@v3 - name: Set up Poetry ${{ matrix.poetry-version }} uses: abatilo/actions-poetry@v2 with: poetry-version: ${{ matrix.poetry-version }} + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v4 + with: + python-version: ${{ matrix.python-version }} + cache: 'poetry' - name: Install dependencies run: | - poetry config virtualenvs.create false poetry install - name: Run tests run: poetry run mypy diff --git a/.github/workflows/on-tag.yml b/.github/workflows/on-tag.yml index a9f58985..2ff8bff0 100644 --- a/.github/workflows/on-tag.yml +++ b/.github/workflows/on-tag.yml @@ -19,7 +19,7 @@ jobs: run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin - name: Checkout project - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Import environment variables id: import-env @@ -66,4 +66,4 @@ jobs: --cache-to "type=local,dest=/tmp/.buildx-cache" \ --platform linux/amd64,linux/arm64 \ --tag ${{ secrets.DOCKER_USERNAME }}/lnbits-legend:latest \ - --output "type=registry" ./ \ No newline at end of file + --output "type=registry" ./ diff --git a/.github/workflows/regtest.yml b/.github/workflows/regtest.yml index eb2630db..7eefb531 100644 --- a/.github/workflows/regtest.yml +++ b/.github/workflows/regtest.yml @@ -10,15 +10,16 @@ jobs: python-version: ["3.9"] poetry-version: ["1.3.1"] steps: - - uses: actions/checkout@v2 - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 - with: - python-version: ${{ matrix.python-version }} + - uses: actions/checkout@v3 - name: Set up Poetry ${{ matrix.poetry-version }} uses: abatilo/actions-poetry@v2 with: poetry-version: ${{ matrix.poetry-version }} + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v4 + with: + python-version: ${{ matrix.python-version }} + cache: "poetry" - name: Setup Regtest run: | docker build -t lnbitsdocker/lnbits-legend . @@ -29,7 +30,6 @@ jobs: sudo chmod -R a+rwx . - name: Install dependencies run: | - poetry config virtualenvs.create false poetry install - name: Run tests env: @@ -54,15 +54,16 @@ jobs: python-version: ["3.9"] poetry-version: ["1.3.1"] steps: - - uses: actions/checkout@v2 - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 - with: - python-version: ${{ matrix.python-version }} + - uses: actions/checkout@v3 - name: Set up Poetry ${{ matrix.poetry-version }} uses: abatilo/actions-poetry@v2 with: poetry-version: ${{ matrix.poetry-version }} + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v4 + with: + python-version: ${{ matrix.python-version }} + cache: "poetry" - name: Setup Regtest run: | docker build -t lnbitsdocker/lnbits-legend . @@ -73,7 +74,6 @@ jobs: sudo chmod -R a+rwx . - name: Install dependencies run: | - poetry config virtualenvs.create false poetry install - name: Run tests env: @@ -99,15 +99,16 @@ jobs: python-version: ["3.9"] poetry-version: ["1.3.1"] steps: - - uses: actions/checkout@v2 - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 - with: - python-version: ${{ matrix.python-version }} + - uses: actions/checkout@v3 - name: Set up Poetry ${{ matrix.poetry-version }} uses: abatilo/actions-poetry@v2 with: poetry-version: ${{ matrix.poetry-version }} + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v4 + with: + python-version: ${{ matrix.python-version }} + cache: "poetry" - name: Setup Regtest run: | docker build -t lnbitsdocker/lnbits-legend . @@ -118,7 +119,6 @@ jobs: sudo chmod -R a+rwx . - name: Install dependencies run: | - poetry config virtualenvs.create false poetry install - name: Run tests env: @@ -141,15 +141,16 @@ jobs: python-version: ["3.9"] poetry-version: ["1.3.1"] steps: - - uses: actions/checkout@v2 - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 - with: - python-version: ${{ matrix.python-version }} + - uses: actions/checkout@v3 - name: Set up Poetry ${{ matrix.poetry-version }} uses: abatilo/actions-poetry@v2 with: poetry-version: ${{ matrix.poetry-version }} + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v4 + with: + python-version: ${{ matrix.python-version }} + cache: "poetry" - name: Setup Regtest run: | docker build -t lnbitsdocker/lnbits-legend . @@ -184,15 +185,16 @@ jobs: python-version: ["3.9"] poetry-version: ["1.3.1"] steps: - - uses: actions/checkout@v2 - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 - with: - python-version: ${{ matrix.python-version }} + - uses: actions/checkout@v3 - name: Set up Poetry ${{ matrix.poetry-version }} uses: abatilo/actions-poetry@v2 with: poetry-version: ${{ matrix.poetry-version }} + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v4 + with: + python-version: ${{ matrix.python-version }} + cache: "poetry" - name: Setup Regtest run: | docker build -t lnbitsdocker/lnbits-legend . @@ -203,7 +205,6 @@ jobs: sudo chmod -R a+rwx . - name: Install dependencies run: | - poetry config virtualenvs.create false poetry install - name: Run tests env: @@ -219,4 +220,4 @@ jobs: - name: Upload coverage to Codecov uses: codecov/codecov-action@v3 with: - file: ./coverage.xml \ No newline at end of file + file: ./coverage.xml diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index dbbddf98..1cb56341 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -10,9 +10,9 @@ jobs: python-version: ["3.9"] poetry-version: ["1.3.1"] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} - name: Install dependencies @@ -33,18 +33,18 @@ jobs: python-version: ["3.9"] poetry-version: ["1.3.1"] steps: - - uses: actions/checkout@v2 - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 - with: - python-version: ${{ matrix.python-version }} + - uses: actions/checkout@v3 - name: Set up Poetry ${{ matrix.poetry-version }} uses: abatilo/actions-poetry@v2 with: poetry-version: ${{ matrix.poetry-version }} + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v4 + with: + python-version: ${{ matrix.python-version }} + cache: "poetry" - name: Install dependencies run: | - poetry config virtualenvs.create false poetry install - name: Run tests run: make test @@ -70,18 +70,18 @@ jobs: python-version: ["3.9"] poetry-version: ["1.3.1"] steps: - - uses: actions/checkout@v2 - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 - with: - python-version: ${{ matrix.python-version }} + - uses: actions/checkout@v3 - name: Set up Poetry ${{ matrix.poetry-version }} uses: abatilo/actions-poetry@v2 with: poetry-version: ${{ matrix.poetry-version }} + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v4 + with: + python-version: ${{ matrix.python-version }} + cache: "poetry" - name: Install dependencies run: | - poetry config virtualenvs.create false poetry install - name: Run tests env: From f1ef9a58fe986aa368f6766162bc3a3ae37fe99a Mon Sep 17 00:00:00 2001 From: Arc <33088785+arcbtc@users.noreply.github.com> Date: Sun, 29 Jan 2023 22:59:38 +0000 Subject: [PATCH 5/5] Revert "fix gitignore (#1429)" This reverts commit ff3f86afa62a98a388ea283eda58176a82474861. --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 5feb2737..3b0b00ba 100644 --- a/.gitignore +++ b/.gitignore @@ -40,4 +40,6 @@ docker # Nix *result* +# Ignore extensions (post installable extension PR) +extensions/ upgrades/ \ No newline at end of file