Skip to content

Commit

Permalink
Change base
Browse files Browse the repository at this point in the history
  • Loading branch information
dragomirp committed Nov 27, 2023
1 parent 528c498 commit 86d04de
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 9 deletions.
4 changes: 1 addition & 3 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,7 @@ jobs:
run: |
app_version=$(yq '.version' rockcraft.yaml)
version=$(yq '(.version|split("-"))[0]' rockcraft.yaml)
base=$(yq '(.base|split(":"))[1]' rockcraft.yaml)
tag=${version}-${base}_edge
sed -i "s/${app_version}/${tag}/g" rockcraft.yaml
base=$(yq '(.base|split("@"))[1]' rockcraft.yaml)
rockcraft pack
- name: Upload rockcraft logs
if: ${{ failure() && steps.pack.outcome == 'failure' }}
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/check_version.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ jobs:
runs-on: ubuntu-22.04
timeout-minutes: 15
steps:
- name: 'Foresight: Collect workflow telemetry'
uses: runforesight/foresight-workflow-kit-action@v1
- uses: actions/checkout@v3
- name: Install yq
run: sudo snap install yq
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
with:
name: charmed-mysql-rock
- name: Login to Docker Hub
uses: docker/login-action@v1
uses: docker/login-action@v2
with:
registry: ghcr.io
username: ${{ secrets.GHCR_USER }}
Expand All @@ -42,9 +42,9 @@ jobs:
run: |
app=$(yq .name rockcraft.yaml)
version=$(yq '(.version)' rockcraft.yaml)
base=$(yq '(.base|split(":"))[1]' rockcraft.yaml)
base=$(yq '(.base|split("@"))[1]' rockcraft.yaml)
tag=${version}-${base}_edge
sudo skopeo --insecure-policy copy \
oci-archive:${app}_${tag}_amd64.rock \
oci-archive:${app}_${version}_amd64.rock \
docker-daemon:ghcr.io/canonical/${app}:${tag}
docker push ghcr.io/canonical/${app}:${tag}
2 changes: 1 addition & 1 deletion rockcraft.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: charmed-mysql # the name of your ROCK
base: ubuntu:22.04 # the base environment for this ROCK
base: ubuntu@22.04 # the base environment for this ROCK
version: '8.0.34' # just for humans. Semantic versioning is recommended
summary: Charmed MySQL ROCK OCI # 79 char long summary
description: |
Expand Down

0 comments on commit 86d04de

Please sign in to comment.