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.

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

Start building from canonical fork #41

Merged
merged 2 commits into from
Apr 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .github/workflows/push_any.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ on:
push:
branches-ignore:
- "main"
- "track/**"
paths:
- "rockcraft.yaml"
- ".github/workflows/**.yaml"
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/push_main.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Push (main)
name: Push (main|track)

# When pushing to the "main" branch, we:
# * build the rock image
Expand All @@ -9,6 +9,7 @@ on:
push:
branches:
- main
- track/**
paths:
- "rockcraft.yaml"
- ".github/workflows/**.yaml"
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ out
gen

# VisualStudioCode template
.vscode/*
.vscode
!.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
Expand Down
7 changes: 4 additions & 3 deletions rockcraft.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: hydra
base: bare
build-base: [email protected]
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.
Expand Down Expand Up @@ -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
Loading