From bee5d3d9e5fe8ecf7cb4331abd40eef6ec943b8b Mon Sep 17 00:00:00 2001 From: Will Fitch Date: Thu, 10 Nov 2022 14:36:41 +0000 Subject: [PATCH] fix release workflow (#37) # PR ## Proposal Added workflow-call to CI.yaml, allowing it to be called from release.yaml. While I'm working on the CI, I also updated LXD and some github actions. ## Commits * added workflow-call to CI.yaml * updated CI actions and lxd --- .github/workflows/ci.yaml | 21 +++++++++++---------- .github/workflows/release.yaml | 6 +++--- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 3e298228e..958af71af 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -1,6 +1,7 @@ name: Tests on: pull_request: + workflow_call: jobs: lint: @@ -8,7 +9,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Install dependencies run: python3 -m pip install tox - name: Run linters @@ -19,7 +20,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Install dependencies run: python -m pip install tox - name: Run tests @@ -33,12 +34,12 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Setup operator environment uses: charmed-kubernetes/actions-operator@main with: provider: lxd - lxd-channel: 5.4/stable + lxd-channel: 5.7/stable - name: Run integration tests run: tox -e standalone-integration @@ -50,12 +51,12 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Setup operator environment uses: charmed-kubernetes/actions-operator@main with: provider: lxd - lxd-channel: 5.4/stable + lxd-channel: 5.7/stable - name: Run integration tests run: tox -e backend-integration @@ -67,12 +68,12 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Setup operator environment uses: charmed-kubernetes/actions-operator@main with: provider: lxd - lxd-channel: 5.4/stable + lxd-channel: 5.7/stable - name: Run integration tests run: tox -e legacy-relation-integration @@ -85,11 +86,11 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Setup operator environment uses: charmed-kubernetes/actions-operator@main with: provider: lxd - lxd-channel: 5.4/stable + lxd-channel: 5.7/stable - name: Run scaling integration tests run: tox -e scaling-integration diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 4aa6c1a3f..2f68a4f87 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: fetch-depth: 0 - name: Check libs @@ -37,10 +37,10 @@ jobs: with: fetch-depth: 0 - name: Select charmhub channel - uses: canonical/charming-actions/channel@2.0.0-rc + uses: canonical/charming-actions/channel@2.1.0 id: channel - name: Upload charm to charmhub - uses: canonical/charming-actions/upload-charm@2.0.0-rc + uses: canonical/charming-actions/upload-charm@2.1.0 with: credentials: "${{ secrets.CHARMHUB_TOKEN }}" github-token: "${{ secrets.GITHUB_TOKEN }}"