Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/github_actions/actions/upload-a…
Browse files Browse the repository at this point in the history
…rtifact-3
  • Loading branch information
iisakkirotko committed Mar 11, 2024
2 parents dbd16e4 + e743318 commit 26084cc
Show file tree
Hide file tree
Showing 52 changed files with 12,205 additions and 9,569 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}

- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: 14
node-version: 20

- name: Cache JS bundle
id: cache-js-bundle-v2
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/codequality.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ on:
schedule:
- cron: '0 6 * * 1,4' # at 06:00 UTC on Monday and Thursday

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
code-quality:
runs-on: ubuntu-latest
Expand All @@ -18,9 +22,9 @@ jobs:
python-version: [3.8, "3.9"]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/installation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ on:
schedule:
- cron: '0 6 * * 1,4' # at 06:00 UTC on Monday and Thursday

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

env:
SOLARA_TELEMETRY_SERVER_USER_ID: "install-test"
SOLARA_TELEMETRY_MIXPANEL_TOKEN: adbf863d17cba80db608788e7fce9843
Expand All @@ -33,10 +37,10 @@ jobs:
python: 3.6
steps:
- name: Set up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python }}
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- uses: actions/download-artifact@v2
with:
name: solara-builds-${{ github.run_number }}
Expand Down
10 changes: 7 additions & 3 deletions .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ on:
schedule:
- cron: '0 6 * * 1,4' # at 06:00 UTC on Monday and Thursday

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

env:
SOLARA_TELEMETRY_SERVER_USER_ID: "install-test"
SOLARA_TELEMETRY_MIXPANEL_TOKEN: adbf863d17cba80db608788e7fce9843
Expand Down Expand Up @@ -37,9 +41,9 @@ jobs:
voila: "0.4.0"

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- uses: actions/download-artifact@v2
Expand All @@ -53,7 +57,7 @@ jobs:
run: mkdir test-results
- name: Install
run: |
pip install ".[dev,server,flask,documentation,pytest]" "voila~=${{ matrix.voila }}" "jupyterlab<4" "pydantic<2"
pip install ".[dev,server,flask,documentation,pytest]" "voila~=${{ matrix.voila }}" "jupyterlab<4" "pydantic<2" "playwright==1.41.2"
(cd packages/solara-enterprise && pip install ".[ssg,auth]" "ipywidgets~=${{ matrix.ipywidgets }}")
- name: Install playwright
run: playwright install
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/integration_vue3.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ on:
schedule:
- cron: "0 6 * * 1,4" # at 06:00 UTC on Monday and Thursday

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

env:
SOLARA_TELEMETRY_SERVER_USER_ID: "install-test"
SOLARA_TELEMETRY_MIXPANEL_TOKEN: adbf863d17cba80db608788e7fce9843
Expand Down Expand Up @@ -37,9 +41,9 @@ jobs:
voila: "0.4.0"

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- uses: actions/download-artifact@v2
Expand Down
12 changes: 8 additions & 4 deletions .github/workflows/javascript.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,23 @@ on:
schedule:
- cron: '0 6 * * 1,4' # at 06:00 UTC on Monday and Thursday

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
build:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Set up Python 3.7
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: 3.7
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: 14
node-version: 20
- name: Install hatch
run: pip install hatch
- name: Build
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ jobs:
needs: [build]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Set up Python 3.7
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: 3.7
- uses: actions/download-artifact@v2
Expand All @@ -30,9 +30,9 @@ jobs:
run: pip install packages/solara-enterprise/dist/*.whl
- name: Test import solara-enterprise
run: python -c "import solara_enterprise"
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: 14
node-version: 20
- name: Build assets
run: (cd packages/assets; hatch build)
- name: Publish solara-enterprise to PyPI
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release_solara_vuetify_app-v3.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Install node
uses: actions/setup-node@v1
uses: actions/setup-node@v4
with:
node-version: "14.x"
node-version: 20
registry-url: "https://registry.npmjs.org"
- name: Build the JS packages
run: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release_solara_vuetify_app.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Install node
uses: actions/setup-node@v1
uses: actions/setup-node@v4
with:
node-version: "14.x"
node-version: 20
registry-url: "https://registry.npmjs.org"
- name: Build the JS packages
run: |
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/unittest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ on:
schedule:
- cron: '0 6 * * 1,4' # at 06:00 UTC on Monday and Thursday

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

env:
SOLARA_TELEMETRY_SERVER_USER_ID: "install-test"
SOLARA_TELEMETRY_MIXPANEL_TOKEN: adbf863d17cba80db608788e7fce9843
Expand Down Expand Up @@ -37,9 +41,9 @@ jobs:
ipywidgets: "8.0"

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Set up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python }}
cache: "pip"
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/webdeploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,18 @@ defaults:
run:
shell: bash -l {0}

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
update-ssg:
name: Update server side generated pages
runs-on: ubuntu-latest

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
token: ${{ secrets.GITHUB_TOKEN }}

Expand All @@ -31,7 +35,7 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Set up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: "3.8"

Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ meeting
/**/.ipynb_checkpoints
#app
dist
lib
python/.idea
test/.idea
venv
Expand Down
Loading

0 comments on commit 26084cc

Please sign in to comment.