Skip to content

Commit 5a96363

Browse files
authored
Merge branch 'develop' into dialogPolyfill
2 parents 28cabc7 + 75be9db commit 5a96363

Some content is hidden

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

56 files changed

+299
-362
lines changed

.github/workflows/add_contributor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212

1313
steps:
1414
- name: Checkout develop branch
15-
uses: actions/checkout@v5
15+
uses: actions/checkout@v6
1616
with:
1717
ref: 'develop'
1818
fetch-depth: 0

.github/workflows/build_pex.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
outputs:
2121
pex-file-name: ${{ steps.get-pex-filename.outputs.pex-file-name }}
2222
steps:
23-
- uses: actions/checkout@v5
23+
- uses: actions/checkout@v6
2424
- uses: actions/cache@v4
2525
with:
2626
path: ~/.cache/pip

.github/workflows/build_whl.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
echo "Acquire::Check-Valid-Until \"false\";" > /etc/apt/apt.conf.d/99archive
2828
apt-get -y -qq update
2929
apt-get install -y gettext sudo sqlite3 binutils-aarch64-linux-gnu binutils-arm-linux-gnueabihf git-lfs
30-
- uses: actions/checkout@v5
30+
- uses: actions/checkout@v6
3131
with:
3232
fetch-depth: 0
3333
lfs: true

.github/workflows/check_docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
3030
runs-on: ubuntu-latest
3131
steps:
32-
- uses: actions/checkout@v5
32+
- uses: actions/checkout@v6
3333
- name: Setup Python
3434
uses: actions/setup-python@v6
3535
with:

.github/workflows/check_licenses.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
3030
runs-on: ubuntu-latest
3131
steps:
32-
- uses: actions/checkout@v5
32+
- uses: actions/checkout@v6
3333
- name: Use Node.js
3434
uses: actions/setup-node@v6
3535
with:

.github/workflows/i18n-download.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
runs-on: ubuntu-latest
1010
steps:
1111
- name: Checkout repository
12-
uses: actions/checkout@v5
12+
uses: actions/checkout@v6
1313
with:
1414
lfs: true
1515

@@ -18,7 +18,9 @@ jobs:
1818
with:
1919
python-version: '3.9'
2020
cache: 'pip'
21-
cache-dependency-path: 'build_tools/i18n/*.py'
21+
cache-dependency-path: |
22+
'build_tools/i18n/*.py'
23+
requirements/base.txt
2224
2325
- name: Set up Node.js
2426
uses: actions/setup-node@v6
@@ -29,6 +31,9 @@ jobs:
2931
- name: Install gettext
3032
run: sudo apt-get update && sudo apt-get install -y gettext
3133

34+
- name: Install Python dependencies
35+
run: pip install -r requirements/base.txt
36+
3237
- name: Install JavaScript dependencies
3338
run: yarn --frozen-lockfile
3439

.github/workflows/i18n-upload.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ jobs:
99
runs-on: ubuntu-latest
1010
steps:
1111
- name: Checkout repository
12-
uses: actions/checkout@v5
12+
uses: actions/checkout@v6
1313

1414
- name: Set up Python
1515
uses: actions/setup-python@v6
1616
with:
1717
python-version: '3.9'
1818
cache: 'pip'
19-
cache-dependency-path: 'build_tools/i18n/*.py'
19+
cache-dependency-path: 'requirements/base.txt'
2020

2121
- name: Set up Node.js
2222
uses: actions/setup-node@v6
@@ -27,6 +27,9 @@ jobs:
2727
- name: Install gettext
2828
run: sudo apt-get update && sudo apt-get install -y gettext
2929

30+
- name: Install Python dependencies
31+
run: pip install -r requirements/base.txt
32+
3033
- name: Install JavaScript dependencies
3134
run: yarn --frozen-lockfile
3235

.github/workflows/morango_integration.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
uses: fkirc/skip-duplicate-actions@master
2121
with:
2222
github_token: ${{ github.token }}
23-
paths: '["requirements/base.txt", ".github/workflows/morango_integration.yml"]'
23+
paths: '["requirements/base.txt", ".github/workflows/morango_integration.yml", "kolibri/core/auth/**/*.py"]'
2424
morango_integration_tests_sqlite:
2525
name: Morango Integration Tests for currently supported Python versions
2626
needs: pre_job
@@ -34,7 +34,7 @@ jobs:
3434

3535
steps:
3636
- name: Checkout repository
37-
uses: actions/checkout@v5
37+
uses: actions/checkout@v6
3838

3939
- name: Set up Python
4040
uses: actions/setup-python@v6
@@ -67,7 +67,7 @@ jobs:
6767
image: python:${{ matrix.python-version }}-buster
6868
steps:
6969
- name: Checkout repository
70-
uses: actions/checkout@v5
70+
uses: actions/checkout@v6
7171

7272
- name: Install tox
7373
run: |
@@ -112,7 +112,7 @@ jobs:
112112

113113
steps:
114114
- name: Checkout repository
115-
uses: actions/checkout@v5
115+
uses: actions/checkout@v6
116116

117117
- name: Set up Python 3.9 for Postgres
118118
uses: actions/setup-python@v6

.github/workflows/no_zombies.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
3030
runs-on: ubuntu-latest
3131
steps:
32-
- uses: actions/checkout@v5
32+
- uses: actions/checkout@v6
3333
- uses: actions/setup-python@v6
3434
with:
3535
python-version: '3.11'

.github/workflows/npm_publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
contents: write
3232
id-token: write # Required for npm provenance
3333
steps:
34-
- uses: actions/checkout@v5
34+
- uses: actions/checkout@v6
3535
- uses: actions/setup-node@v6
3636
with:
3737
node-version: '20.x'

0 commit comments

Comments
 (0)