diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index c8aaf1f..54c03c0 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -21,27 +21,20 @@ name: main on: push: pull_request: - workflow_dispatch: schedule: - cron: "0 0 * * 0" jobs: test: strategy: fail-fast: false - matrix: - skupper-version: [latest, main] runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - uses: actions/setup-python@v5 with: python-version: "3.x" - - uses: manusa/actions-setup-minikube@v2.10.0 - with: - minikube version: "v1.32.0" - kubernetes version: "v1.29.0" - github token: ${{secrets.GITHUB_TOKEN}} - - run: curl https://skupper.io/install.sh | bash -s -- --version ${{matrix.skupper-version}} + - uses: medyagh/setup-minikube@latest + - run: curl https://skupper.io/v2/install.sh | sh - run: echo "$HOME/.local/bin" >> "$GITHUB_PATH" - run: ./plano test env: diff --git a/external/skewer/.github/workflows/main.yaml b/external/skewer/.github/workflows/main.yaml index 1315b1f..54c03c0 100644 --- a/external/skewer/.github/workflows/main.yaml +++ b/external/skewer/.github/workflows/main.yaml @@ -1,3 +1,22 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# + name: main on: push: @@ -8,8 +27,6 @@ jobs: test: strategy: fail-fast: false - matrix: - skupper-version: [2.0.0] runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 @@ -17,8 +34,8 @@ jobs: with: python-version: "3.x" - uses: medyagh/setup-minikube@latest - - run: curl https://skupper.io/install.sh | bash -s -- --version ${{matrix.skupper-version}} - - run: echo "$HOME/.local/bin" >> $GITHUB_PATH + - run: curl https://skupper.io/v2/install.sh | sh + - run: echo "$HOME/.local/bin" >> "$GITHUB_PATH" - run: ./plano test env: PLANO_COLOR: 1 diff --git a/external/skewer/.plano.py b/external/skewer/.plano.py index 9b10e5f..4609d49 100644 --- a/external/skewer/.plano.py +++ b/external/skewer/.plano.py @@ -17,62 +17,4 @@ # under the License. # -import skewer.tests - -from plano import * -from plano.github import * -from skewer import * - -@command(passthrough=True) -def test(passthrough_args=[]): - PlanoTestCommand(skewer.tests).main(args=passthrough_args) - -@command -def coverage(verbose=False, quiet=False): - check_program("coverage") - - with working_env(PYTHONPATH="python"): - run("coverage run --source skewer -m skewer.tests") - - run("coverage report") - run("coverage html") - - if not quiet: - print(f"file:{get_current_dir()}/htmlcov/index.html") - -@command -def render(verbose=False, quiet=False): - """ - Render README.html from README.md - """ - markdown = read("README.md") - html = convert_github_markdown(markdown) - - write("README.html", html) - - if not quiet: - print(f"file:{get_real_path('README.html')}") - -@command -def list_standard_steps(): - """ - List the standard steps - """ - data = read_yaml("python/skewer/standardsteps.yaml") - - for key in data: - print(key) - -@command -def clean(): - remove(find(".", "__pycache__")) - remove("README.html") - remove("htmlcov") - remove(".coverage") - -@command -def update_plano(): - """ - Update the embedded Plano repo - """ - update_external_from_github("external/plano", "ssorj", "plano") +from skewer.planocommands import *