Skip to content

Commit

Permalink
Merge branch 'master' into feat/progress-path-curved-variant
Browse files Browse the repository at this point in the history
  • Loading branch information
esmeetewinkel authored Feb 19, 2025
2 parents d3f63e4 + 9e66680 commit bffa8e3
Show file tree
Hide file tree
Showing 264 changed files with 7,150 additions and 1,740 deletions.
9 changes: 0 additions & 9 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,12 +1,3 @@
*.png filter=lfs diff=lfs merge=lfs -text
*.jpg filter=lfs diff=lfs merge=lfs -text
*.mp4 filter=lfs diff=lfs merge=lfs -text
*.mp3 filter=lfs diff=lfs merge=lfs -text
*.wav filter=lfs diff=lfs merge=lfs -text
*.gif filter=lfs diff=lfs merge=lfs -text
*.pdn filter=lfs diff=lfs merge=lfs -text
*.svg filter=lfs diff=lfs merge=lfs -text
*.xlsx filter=lfs diff=lfs merge=lfs -text

*.json eol=crlf
*.ts eol=crlf
Expand Down
52 changes: 0 additions & 52 deletions .github/workflows/deprecated/build-and-upload.yml

This file was deleted.

92 changes: 0 additions & 92 deletions .github/workflows/deprecated/deployment-hosting.yml

This file was deleted.

58 changes: 0 additions & 58 deletions .github/workflows/deprecated/pr-build.yml

This file was deleted.

77 changes: 0 additions & 77 deletions .github/workflows/deprecated/sourcemaps-upload.yml

This file was deleted.

53 changes: 0 additions & 53 deletions .github/workflows/deprecated/test-e2e.yml

This file was deleted.

7 changes: 0 additions & 7 deletions .github/workflows/documentation-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,6 @@ jobs:
steps:
- name: Checkout main
uses: actions/checkout@v4
# Only pull lfs files for documentation folder
# https://github.com/git-lfs/git-lfs/issues/1351
- name: Checkout git lfs partial files
run: git lfs pull --include "documentation/*"
- name: Remove Git LFS requirements
# Github pages fails when expecting LFS, so remove hook
run: rm .git/hooks/pre-push
- name: Deploy docs
uses: mhausenblas/mkdocs-deploy-gh-pages@e55ecab6718b449a90ebd4313f1320f9327f1386
env:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/reusable-android-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ jobs:
with:
repository: "IDEMSInternational/open-app-builder.git"
ref: ${{env.APP_CODE_BRANCH}}
lfs: true

- name: Checkout parent repo if needed
if: env.PARENT_DEPLOYMENT_REPO != ''
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/reusable-app-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ on:
type: string
default: ""
lfs:
description: Enable git lfs to include download of all binary assets (user-facing deployments)
description: Enable git lfs asset download for content repos (if used by repo)
type: boolean
default: true

Expand Down Expand Up @@ -72,13 +72,16 @@ jobs:
path: ".idems_app/deployments/${{env.PARENT_DEPLOYMENT_NAME}}"
repository: ${{env.PARENT_DEPLOYMENT_REPO}}
ref: ${{env.PARENT_DEPLOYMENT_BRANCH}}
# main repo does not use lfs so explicitly omit
lfs: false

- name: Checkout deployment
uses: actions/checkout@v4
with:
ref: ${{inputs.branch}}
path: ".idems_app/deployments/${{env.DEPLOYMENT_NAME}}"
fetch-depth: 0
# content repo optionally includes lfs
lfs: ${{inputs.lfs}}

- name: Populate Encryption key
Expand Down
Loading

0 comments on commit bffa8e3

Please sign in to comment.