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

Make use of ssh git urls instead of https #3

Merged
merged 3 commits into from
Dec 6, 2023
Merged

Make use of ssh git urls instead of https #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9a55f3a
Make it possible to override git urls and branches
spaceo Dec 6, 2023
e347a34
Use https urls for repos prevents us for using secrets/tokens
spaceo Dec 6, 2023
4c11cd7
Consolidate Taskfile vars
spaceo Dec 6, 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
3 changes: 3 additions & 0 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ on:
env:
# Group output as we make heavy use of parallel and nested tasks.
TASK_OUTPUT: "--output group --output-group-begin '::group::{{.TASK}}' --output-group-end '::endgroup::'"
GIT_REPO_URL_DESIGN_SYSTEM: https://github.com/danskernesdigitalebibliotek/dpl-design-system
GIT_REPO_URL_REACT: https://github.com/danskernesdigitalebibliotek/dpl-react
GIT_REPO_URL_CMS: https://github.com/danskernesdigitalebibliotek/dpl-cms

jobs:
test:
Expand Down
23 changes: 20 additions & 3 deletions Taskfile.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,23 @@ vars:
COMPOSE_PREFIX: dapple
CMS_COMPOSE_PROJECT_NAME: "{{.COMPOSE_PREFIX}}-cms"
REACT_COMPOSE_PROJECT_NAME: "{{.COMPOSE_PREFIX}}-react"
# Defaults
DEFAULT_GIT_REPO_URL_DESIGN_SYSTEM: [email protected]:danskernesdigitalebibliotek/dpl-design-system
DEFAULT_GIT_BRANCH_DESIGN_SYSTEM: develop
DEFAULT_GIT_REPO_URL_REACT: [email protected]:danskernesdigitalebibliotek/dpl-react
DEFAULT_GIT_BRANCH_REACT: develop
DEFAULT_GIT_REPO_URL_CMS: [email protected]:danskernesdigitalebibliotek/dpl-cms
DEFAULT_GIT_BRANCH_CMS: develop
# Actual values
GIT_REPO_URL_DESIGN_SYSTEM: '{{.GIT_REPO_URL_DESIGN_SYSTEM | default .DEFAULT_GIT_REPO_URL_DESIGN_SYSTEM}}'
GIT_BRANCH_DESIGN_SYSTEM: '{{.GIT_BRANCH_DESIGN_SYSTEM | default .DEFAULT_GIT_BRANCH_DESIGN_SYSTEM}}'
GIT_REPO_URL_REACT: '{{.GIT_REPO_URL_REACT | default .DEFAULT_GIT_REPO_URL_REACT}}'
GIT_BRANCH_REACT: '{{.GIT_BRANCH_REACT | default .DEFAULT_GIT_BRANCH_REACT}}'
GIT_REPO_URL_CMS: '{{.GIT_REPO_URL_CMS | default .DEFAULT_GIT_REPO_URL_CMS}}'
GIT_BRANCH_CMS: '{{.GIT_BRANCH_CMS | default .DEFAULT_GIT_BRANCH_CMS}}'

# If vars are specified here they will override the defaults above.
dotenv: ['.env']

tasks:
init:
Expand Down Expand Up @@ -38,7 +55,7 @@ tasks:

design-system:clone:
cmds:
- git clone https://github.com/danskernesdigitalebibliotek/dpl-design-system design-system
- git clone {{ .GIT_REPO_URL_DESIGN_SYSTEM }} -b {{ .GIT_BRANCH_DESIGN_SYSTEM }} design-system

design-system:install:
dir: design-system
Expand Down Expand Up @@ -82,7 +99,7 @@ tasks:

react:clone:
cmds:
- git clone https://github.com/danskernesdigitalebibliotek/dpl-react react
- git clone {{ .GIT_REPO_URL_REACT}} -b {{ .GIT_BRANCH_REACT }} react
# Set project name to avoid conflicts with single checkouts.
- cp react/.env.example react/.env
- echo "COMPOSE_PROJECT_NAME={{.REACT_COMPOSE_PROJECT_NAME}}" >> react/.env
Expand Down Expand Up @@ -133,7 +150,7 @@ tasks:

cms:clone:
cmds:
- git clone https://github.com/danskernesdigitalebibliotek/dpl-cms cms
- git clone {{ .GIT_REPO_URL_CMS }} -b {{ .GIT_BRANCH_CMS }} cms
# Set project name to avoid conflicts with single checkouts.
- sed "s|COMPOSE_PROJECT_NAME=dpl-cms|COMPOSE_PROJECT_NAME={{.CMS_COMPOSE_PROJECT_NAME}}|g" <cms/.env.example >cms/.env

Expand Down