Skip to content

Commit

Permalink
Merge pull request #291 from jdkandersson/main
Browse files Browse the repository at this point in the history
switch to new charmcraft and rockcraft extensions
  • Loading branch information
jpmartinspt authored Apr 2, 2024
2 parents 8170248 + af0a015 commit c3a7b5d
Show file tree
Hide file tree
Showing 9 changed files with 1,219 additions and 542 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/deploy.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
name: Deploy site

on:
on:
push:
branches:
branches:
- main

env:
Expand All @@ -11,7 +11,7 @@ env:

jobs:
pack-charm:
runs-on: ubuntu-latest
runs-on: ubuntu-latest
steps:
- name: Checkout Code
uses: actions/checkout@v3
Expand All @@ -20,7 +20,7 @@ jobs:
uses: canonical/setup-lxd@main

- name: Setup Charmcraft
run: sudo snap install charmcraft --classic --channel=edge/12f
run: sudo snap install charmcraft --classic --channel=latest/edge

- name: Pack charm
run: charmcraft pack -v --project-dir ./charm
Expand Down Expand Up @@ -50,7 +50,7 @@ jobs:
uses: canonical/setup-lxd@main

- name: Setup Rockcraft
run: sudo snap install rockcraft --classic --channel=edge/12f
run: sudo snap install rockcraft --classic --channel=latest/edge

- name: Pack Rock
run: rockcraft pack
Expand All @@ -71,7 +71,7 @@ jobs:
uses: actions/download-artifact@v3
with:
name: dqlite-io-rock

- name: Set image URL
id: set_image_url
run: echo "image_url=ghcr.io/canonical/dqlite.io:$(date +%s)-${GITHUB_SHA:0:7}" >> $GITHUB_OUTPUT
Expand Down
11 changes: 11 additions & 0 deletions charm/charmcraft.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
name: dqlite-io

type: charm

bases:
- build-on:
- name: ubuntu
Expand All @@ -14,3 +16,12 @@ description: This is the charm for the dqlite.io website.

extensions:
- flask-framework

# Uncomment the integrations used by your application
# requires:
# mysql:
# interface: mysql_client
# limit: 1
# postgresql:
# interface: postgresql_client
# limit: 1
Loading

0 comments on commit c3a7b5d

Please sign in to comment.