From 6e4bc6bfa78e5943a2581ca4fe4e48e98b36cba8 Mon Sep 17 00:00:00 2001 From: Nikos Date: Tue, 23 Apr 2024 12:50:50 +0300 Subject: [PATCH] ci: start building from the canonical fork --- .github/workflows/push_any.yaml | 1 + .github/workflows/push_main.yaml | 3 ++- rockcraft.yaml | 7 ++++--- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/push_any.yaml b/.github/workflows/push_any.yaml index 6e803746..4945d6ab 100644 --- a/.github/workflows/push_any.yaml +++ b/.github/workflows/push_any.yaml @@ -7,6 +7,7 @@ on: push: branches-ignore: - "main" + - "track/**" paths: - "rockcraft.yaml" - ".github/workflows/**.yaml" diff --git a/.github/workflows/push_main.yaml b/.github/workflows/push_main.yaml index 1b975272..b499c494 100644 --- a/.github/workflows/push_main.yaml +++ b/.github/workflows/push_main.yaml @@ -1,4 +1,4 @@ -name: Push (main) +name: Push (main|track) # When pushing to the "main" branch, we: # * build the rock image @@ -9,6 +9,7 @@ on: push: branches: - main + - track/** paths: - "rockcraft.yaml" - ".github/workflows/**.yaml" diff --git a/rockcraft.yaml b/rockcraft.yaml index e546137a..3b0bb142 100644 --- a/rockcraft.yaml +++ b/rockcraft.yaml @@ -1,7 +1,7 @@ name: hydra base: bare build-base: ubuntu@22.04 -version: "2.2.0" +version: "2.2.0-canonical" summary: Ory Hydra description: | Ory Hydra is a hardened and certified OAuth 2.0 and OpenID Connect provider. @@ -54,6 +54,7 @@ parts: export CGO_ENABLED=0 go mod download all go build -ldflags="${go_linker_flags}" -o "${CRAFT_PART_INSTALL}"/bin/hydra - source: https://github.com/ory/hydra + source: https://github.com/canonical/hydra source-type: git - source-tag: v2.2.0 + # TODO: use tag once we release a version + source-branch: canonical