Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: cut v3.5.0 #5400

Merged
merged 1 commit into from
Apr 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/accessibility.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@ name: Accessibility
on:
push:
branches:
- main
- "3.*"
- "3.5"
jobs:
cypress-axe:
name: cypress-axe
Expand All @@ -18,6 +17,7 @@ jobs:
uses: canonical/setup-maas@main
with:
maas-url: ${{env.MAAS_URL}}/MAAS
channel: 3.5/beta
- name: Install Cypress
uses: cypress-io/github-action@v4
with:
Expand Down
9 changes: 4 additions & 5 deletions .github/workflows/cypress.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@ name: Cypress
on:
push:
branches:
- main
- "3.*"
- "*cypress*"
- "3.5"
pull_request:
types: [opened, synchronize, reopened]

Expand All @@ -15,7 +13,7 @@ jobs:
strategy:
fail-fast: false
matrix:
groups: ['no-users', 'with-users']
groups: ["no-users", "with-users"]
env:
MAAS_URL: http://localhost:5240
MAAS_UI_URL: http://localhost:8400
Expand All @@ -27,6 +25,7 @@ jobs:
uses: canonical/setup-maas@main
with:
maas-url: ${{ env.MAAS_URL }}/MAAS
channel: 3.5/beta
- name: Install Cypress
uses: cypress-io/github-action@v4
with:
Expand Down Expand Up @@ -70,4 +69,4 @@ jobs:
WORKFLOW: ${{ github.workflow }}
with:
filename: .github/ISSUE_TEMPLATE/ci-failure.md
update_existing: true
update_existing: true
6 changes: 4 additions & 2 deletions .github/workflows/playwright.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
name: Playwright Tests
on:
push:
branches: [main]
branches:
- "3.5"
jobs:
test:
timeout-minutes: 15
Expand All @@ -12,7 +13,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version-file: '.nvmrc'
node-version-file: ".nvmrc"
- name: Install dependencies
run: yarn
- name: Install Playwright Browsers
Expand All @@ -21,6 +22,7 @@ jobs:
uses: canonical/setup-maas@main
with:
maas-url: ${{env.MAAS_URL}}/MAAS
channel: 3.5/beta
- name: Create MAAS admin
run: sudo maas createadmin --username=admin --password=test --email=fake@example.org
- name: Wait for MAAS UI to be ready
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/sitespeed.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@ name: sitespeed.io
on:
push:
branches:
- main
- "3.*"
- "3.5"
jobs:
run-sitespeed:
name: Run sitespeed.io
Expand All @@ -19,6 +18,7 @@ jobs:
uses: canonical/setup-maas@main
with:
maas-url: ${{ env.MAAS_URL }}/MAAS
channel: 3.5/beta
use-maasdb-dump: true
maasdb-dump-url: https://github.com/canonical/maas-ui-testing/raw/main/db/maasdb-22.04-master-1000.dump
- name: Create MAAS admin
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: CI
on:
push:
branches:
- main
- "3.5"
pull_request:
types: [opened, synchronize, reopened]
jobs:
Expand All @@ -20,7 +20,7 @@ jobs:
- name: Use Node.js from .nvmrc
uses: actions/setup-node@v4
with:
node-version-file: '.nvmrc'
node-version-file: ".nvmrc"
- name: Install
if: steps.yarn-cache.outputs.cache-hit != 'true'
run: CYPRESS_INSTALL_BINARY=0 yarn install
Expand All @@ -40,7 +40,7 @@ jobs:
- name: Use Node.js from .nvmrc
uses: actions/setup-node@v4
with:
node-version-file: '.nvmrc'
node-version-file: ".nvmrc"
- name: Install
if: steps.yarn-cache.outputs.cache-hit != 'true'
run: CYPRESS_INSTALL_BINARY=0 yarn install
Expand All @@ -61,7 +61,7 @@ jobs:
- name: Use Node.js from .nvmrc
uses: actions/setup-node@v4
with:
node-version-file: '.nvmrc'
node-version-file: ".nvmrc"
- name: Install
if: steps.yarn-cache.outputs.cache-hit != 'true'
run: CYPRESS_INSTALL_BINARY=0 yarn install
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/upload.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@ name: Build upload
on:
push:
branches:
- main
- "3.*"
- "3.5"
jobs:
upload-build:
if: github.repository_owner == 'canonical'
Expand All @@ -25,7 +24,7 @@ jobs:
- name: Use Node.js from .nvmrc
uses: actions/setup-node@v4
with:
node-version-file: '.nvmrc'
node-version-file: ".nvmrc"
- name: Install
if: steps.yarn-cache.outputs.cache-hit != 'true'
run: CYPRESS_INSTALL_BINARY=0 yarn install
Expand Down
Loading