Skip to content

Commit

Permalink
Merge branch 'master' into feat/remote-assets
Browse files Browse the repository at this point in the history
  • Loading branch information
jfmcquade committed Sep 23, 2024
2 parents b4720ef + f4c0307 commit da135b2
Show file tree
Hide file tree
Showing 168 changed files with 4,129 additions and 1,509 deletions.
15 changes: 12 additions & 3 deletions .github/pr-labeler.config.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
# Additional labels to assign based on file changes
"documentation":
- documentation/**/*
# Patterns to match to auto-assign labels based on path changes
# https://github.com/actions/labeler/tree/v5/?tab=readme-ov-file#match-object

# Documentation
'documentation':
- changed-files:
- any-glob-to-any-file: 'documentation/**/*'

# Scripts
'scripts':
- changed-files:
- any-glob-to-any-file: 'packages/scripts/**/*'
2 changes: 1 addition & 1 deletion .github/workflows/deprecated/build-and-upload.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [16]
node-version: [20]

steps:
- name: Install crcmod
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/deprecated/deployment-hosting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
echo "DEPLOYMENT_NAME=${{needs.build.outputs.DEPLOYMENT_NAME}}" >> $GITHUB_ENV
echo "GIT_SHA=${{needs.build.outputs.GIT_SHA}}" >> $GITHUB_ENV
- name: Download Build Artifact
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: www
- name: Extract Build folder
Expand All @@ -52,7 +52,7 @@ jobs:
SENTRY_PROJECT: ${{env.DEPLOYMENT_NAME}}
continue-on-error: true
- name: Store sourcemaps artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: sourcemaps-$GIT_SHA
path: www/*.map
Expand All @@ -65,7 +65,7 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Download Build Artifact
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: www
- name: Extract Build folder
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deprecated/pr-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [16]
node-version: [20]

steps:
- name: Get PR Number
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/deprecated/sourcemaps-upload.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
- name: Node ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: 16
node-version: 20.17.0
cache: 'yarn'
- name: Populate environment config
env:
Expand Down Expand Up @@ -60,7 +60,7 @@ jobs:
SENTRY_PROJECT: ${{env.DEPLOYMENT_NAME}}
continue-on-error: true
- name: Store sourcemaps artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: sourcemaps-$SHA_SHORT
path: www/*.map
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deprecated/test-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
- name: Node ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: 16
node-version: 20.17.0
cache: 'yarn'
- name: Populate firebaseConfig.ts
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/documentation-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: Setup Node
uses: actions/setup-node@v3
with:
node-version: 16
node-version: 20.17.0
cache: 'yarn'
- run: yarn install --immutable
- name: Spellcheck
Expand Down
26 changes: 26 additions & 0 deletions .github/workflows/gh-pr-label-paths.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# Automatically apply labels to PR based on filepaths of modified files
name: Github PR Label Paths
on:
pull_request:
# https://frontside.com/blog/2020-05-26-github-actions-pull_request/
types:
- opened
- synchronize
jobs:
label:
if: ${{ !contains(github.event.pull_request.labels.*.name , 'no-autolabel')}}
permissions:
contents: read
pull-requests: write
runs-on: ubuntu-latest
steps:
# Checkout repo to access local templates (if updated)
- name: checkout
uses: actions/checkout@main
# Assign labels based on files modified
# https://github.com/actions/labeler
- name: Assign PR path Labels
uses: actions/labeler@v5
with:
configuration-path: .github/pr-labeler.config.yml
sync-labels: false
51 changes: 51 additions & 0 deletions .github/workflows/gh-pr-label-title.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
# Automatically apply labels to PR based on title (if written in semantic format)
name: Github PR Label Title
on:
pull_request:
# https://frontside.com/blog/2020-05-26-github-actions-pull_request/
types:
- opened
- ready_for_review
jobs:
label:
# Avoid re-label if title not changed or using custom label to prevent
# https://github.com/orgs/community/discussions/101695
if: |
${{ !contains(github.event.pull_request.labels.*.name , 'no-autolabel')}} &&
(event.type == 'opened' || event.changes.title.from)
runs-on: ubuntu-latest
steps:
# Checkout repo to access local templates (if updated)
- name: checkout
uses: actions/checkout@main
# Check if PR title matches conventional commit standard
# Not strictly enforced so allow continue on error
# https://github.com/marketplace/actions/semantic-pull-request
- name: Validate PR title
uses: amannn/action-semantic-pull-request@v5
continue-on-error: true
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
# Assign labels based on conventional PR title
# https://github.com/marketplace/actions/conventional-release-labels
- name: Assign PR Name Labels
uses: bcoe/[email protected]
with:
# Labels assigned based on pr name prefix
type_labels: |
{
"breaking": "breaking",
"chore": "maintenance",
"docs": "documentation",
"feat": "feature",
"fix": "fix",
"refactor": "maintenance",
"Breaking": "breaking",
"Chore": "maintenance",
"Docs": "documentation",
"Feat": "feature",
"Fix": "fix",
"Refactor": "maintenance"
}
# Do not ignore any labels (default ignores chore:)
ignored_types: '[]'
44 changes: 0 additions & 44 deletions .github/workflows/gh-pr-labeler.yml

This file was deleted.

8 changes: 4 additions & 4 deletions .github/workflows/reusable-android-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ jobs:
- name: Setup Node
uses: actions/setup-node@v3
with:
node-version: 18.x
node-version: 20.17.0
- uses: actions/cache/restore@v3
id: cache
with:
Expand All @@ -104,7 +104,7 @@ jobs:
run: yarn workflow android

- name: Download Build Artifact
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: www

Expand Down Expand Up @@ -134,7 +134,7 @@ jobs:
run: ./gradlew :app:assembleDebug

- name: Upload debug apk
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: debug_apk
path: android/app/build/outputs/apk/debug/app-debug.apk
Expand All @@ -155,7 +155,7 @@ jobs:
keyPassword: ${{ env.KEY_PASSWORD }}

- name: Upload release bundle
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: release_bundle
path: ${{steps.sign_aab.outputs.signedReleaseFile}}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/reusable-android-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:

- name: Download Build Artifact
id: download
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: release_bundle
path: ./
Expand Down
38 changes: 24 additions & 14 deletions .github/workflows/reusable-app-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,21 +56,21 @@ jobs:

steps:
- name: Check out app code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: "IDEMSInternational/open-app-builder.git"
ref: ${{env.APP_CODE_BRANCH}}

- name: Checkout parent repo if needed
if: env.PARENT_DEPLOYMENT_REPO != ''
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
path: ".idems_app/deployments/${{env.PARENT_DEPLOYMENT_NAME}}"
repository: ${{env.PARENT_DEPLOYMENT_REPO}}
ref: ${{env.PARENT_DEPLOYMENT_BRANCH}}

- name: Checkout deployment
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: ${{inputs.branch}}
path: ".idems_app/deployments/${{env.DEPLOYMENT_NAME}}"
Expand All @@ -81,30 +81,40 @@ jobs:
run: echo "${{env.DEPLOYMENT_PRIVATE_KEY}}" > ./.idems_app/deployments/${{env.DEPLOYMENT_NAME}}/encrypted/private.key

- name: Setup Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 18.x
node-version: 20.17.0


- name: Cache node modules
uses: actions/cache@v3
#############################################################################
# Node Modules
# Manually restore any previous cache to speed install
# As immutable install will not change cache only save new cache if not hit
# Uses fine-grained methods from https://github.com/actions/cache
#############################################################################
- uses: actions/cache/restore@v4
id: cache
with:
path: ./.yarn/cache
# If cachebusting required (e.g. breaking yarn changes on update) change `v1` to another number
key: ${{ runner.os }}-node-modules-yarn-v1-${{ hashFiles('**/yarn.lock') }}
key: ${{ runner.os }}-node-modules-yarn-v1-${{ hashFiles('yarn.lock') }}
restore-keys: |
${{ runner.os }}-node-modules-yarn-v1-
- name: Install node modules
run: yarn install

run: yarn install --immutable
- uses: actions/cache/save@v4
if: steps.cache.outputs.cache-hit != 'true'
with:
path: ./.yarn/cache
key: ${{ runner.os }}-node-modules-yarn-v1-${{ hashFiles('yarn.lock') }}

- name: Set deployment
run: yarn workflow deployment set $DEPLOYMENT_NAME --skip-refresh

- name: Build
run: yarn build ${{inputs.build-flags}}

- name: Upload artifact
uses: actions/upload-pages-artifact@v1.0.8
uses: actions/upload-pages-artifact@v3
with:
path: "www/"
name: www
2 changes: 1 addition & 1 deletion .github/workflows/reusable-appetize.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
- uses: actions/checkout@v3

- name: Download Build Artifact
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: debug_apk
path: ./
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/reusable-content-sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ jobs:
- name: Setup Node
uses: actions/setup-node@v3
with:
node-version: 18.x
node-version: 20.17.0

- name: Cache node modules
uses: actions/cache@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/reusable-deploy-pr-preview.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
- uses: actions/checkout@v3

- name: Download Build Artifact
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: www

Expand Down
Loading

0 comments on commit da135b2

Please sign in to comment.