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.

Sign up for GitHub

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

Fixes lagging version of jimm release in our CI/CD #1054

Closed
wants to merge 2 commits into from
+31 −10
Closed

Fixes lagging version of jimm release in our CI/CD #1054

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a10dfb1
checkout v4 and get tags
mina1460 Oct 12, 2023
fdba783
rollback fetch --tags but keep v4
mina1460 Oct 12, 2023
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
5 changes: 4 additions & 1 deletion .github/workflows/charm-build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,10 @@ jobs:
matrix:
charm-type: ["jimm","jimm-k8s"]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
fetch-tags: true
- run: git fetch --prune --unshallow
- run: sudo snap install charmcraft --channel=2.x/stable --classic
- run: sudo charmcraft pack --project-dir ./charms/${{ matrix.charm-type }} --destructive-mode --verbosity=trace
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/charm-release.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,10 @@ jobs:
timeout-minutes: 60
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
fetch-tags: true
- name: Build local images
run: make jimm-image
- name: Upload charm to charmhub
Expand All @@ -52,9 +53,10 @@ jobs:
timeout-minutes: 60
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
fetch-tags: true
- uses: actions/download-artifact@master
with:
name: jimm-snap
Expand Down
10 changes: 8 additions & 2 deletions .github/workflows/charm-test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,10 @@ jobs:
working-directory: ./charms/${{ matrix.charm-type }}
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
fetch-tags: true
- name: Install dependencies
run: python3 -m pip install tox
- name: Run linters
Expand All @@ -37,7 +40,10 @@ jobs:
working-directory: ./charms/${{ matrix.charm-type }}
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
fetch-tags: true
- name: Install dependencies
run: python -m pip install tox
- name: Run tests
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/charm.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
build-charm:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why fetch-* options are not used here (i.e., in charm.yaml), but have been used in charm test actions? I imagine both should have the same interest in git tags, right?

- run: git fetch --prune --unshallow
- run: sudo snap install charmcraft --channel=2.x/stable --classic
- run: charmcraft pack --project-dir ./charms/${{ inputs.charm }} --destructive-mode
Expand Down
10 changes: 8 additions & 2 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,10 @@ jobs:
name: Build and Test
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-tags: true
fetch-depth: 0
- uses: actions/setup-go@v4
with:
go-version-file: 'go.mod'
Expand Down Expand Up @@ -60,7 +63,10 @@ jobs:
# The docker compose has a healthcheck on the JIMM container.
# So if the compose returns with exit code 0 then the JIMM server successfully started.
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
fetch-tags: true
- name: Pull candid repo for test environment
run: |
git clone https://github.com/canonical/candid.git ./tmp/candid
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/snap-release.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,10 @@ jobs:
snap: ${{ steps.snapcraft.outputs.snap }}
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
fetch-tags: true
- name: scripts
run: |
mkdir -p ./snap
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/snap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,10 @@ jobs:
build-snap:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
fetch-tags: true
- run: git fetch --prune --unshallow
- uses: actions/setup-go@v4
with:
Expand Down