Skip to content

Commit

Permalink
Merge pull request #271 from canonical/KU-542/1.29-initialise
Browse files Browse the repository at this point in the history
Initialise 1.29 branch
  • Loading branch information
bschimke95 authored Apr 3, 2024
2 parents 7a64a17 + d55b414 commit ae39669
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 9 deletions.
4 changes: 1 addition & 3 deletions .github/workflows/check-formatting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@ name: Lint Code

on:
pull_request:
branches: [main]
push:
branches: [main]
branches: [1.29]

jobs:
check-formatting:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cla-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: cla-check

on:
pull_request:
branches: [main, default]
branches: [1.29]

jobs:
cla-check:
Expand Down
8 changes: 3 additions & 5 deletions .github/workflows/run-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,15 @@ name: Run tests

on:
pull_request:
branches: [main]
push:
branches: [main]
branches: [1.29]

jobs:
run-tests:
name: Run tests
runs-on: ubuntu-latest
strategy:
matrix:
channel: [latest/edge, latest/edge/strict]
channel: [1.29/edge, 1.29-strict/edge]

steps:
- name: Check out code
Expand All @@ -32,7 +30,7 @@ jobs:
sudo microk8s addons repo remove core
sudo microk8s addons repo add core .
export UNDER_TIME_PRESSURE="True"
if [[ "${{ matrix.channel }}" == "latest/edge/strict" ]]
if [[ "${{ matrix.channel }}" == "1.29-strict/edge" ]]
then
export STRICT="yes"
fi
Expand Down

0 comments on commit ae39669

Please sign in to comment.