Skip to content

Bump dedoc/scramble from 0.12.20 to 0.12.21 #290

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

Closed
wants to merge 2 commits into from
Closed
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
3 changes: 3 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ indent_style = space
insert_final_newline = true
trim_trailing_whitespace = true

[*.{cjs,mjs,js,jsx,ts,tsx,json,css}]
indent_size = 2

[*.md]
trim_trailing_whitespace = false

Expand Down
2 changes: 1 addition & 1 deletion .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ SESSION_DOMAIN=null

BROADCAST_CONNECTION=log
FILESYSTEM_DISK=local
QUEUE_CONNECTION=database
QUEUE_CONNECTION=sync

CACHE_STORE=database
# CACHE_PREFIX=
Expand Down
9 changes: 0 additions & 9 deletions .eslintignore

This file was deleted.

53 changes: 0 additions & 53 deletions .eslintrc.cjs

This file was deleted.

8 changes: 4 additions & 4 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ Please provide detailed steps for reproducing the issue.

Please provide any relevant information about your setup. This is important in case the issue is not reproducible except for under certain conditions.

- Firmware Version:
- Operating System:
- SDK version:
- Toolchain version:
* Firmware Version:
* Operating System:
* SDK version:
* Toolchain version:

## Failure Logs

Expand Down
24 changes: 11 additions & 13 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,8 @@
# ⚡ TaskTitle - [###](https://app.clickup.com/t/###) ⚡
# ⚡ {0} - [{1}](https://app.clickup.com/t/{2}) ⚡

## 💻 What type of change is this?

- [ ] 💎 Feature
- [ ] 🐛 Bug Fix
- [ ] 📝 Documentation Update
- [ ] 🎨 Styling
- [ ] 🧑‍💻 Code Refactor
- [ ] 🔥 Performance Improvements
- [ ] ✅ Test
- [ ] 🤖 Build / CI
{3}

## ⭐ Description

Expand All @@ -18,7 +11,7 @@ Please include a summary of the change and which issue is fixed. Please also inc
Example:
-->

For more background, see ticket **CU-#[in-progress].**
For more background, see ticket **{1}[in-progress].**

<!--
ONLY ADD SECTION IF A NEW PACKAGE IS ADDED
Expand All @@ -39,21 +32,26 @@ Please include before AND after screenshots of the change, or proof of test abou

### Before

![image](https://github.com/Light-it-labs/lightranet/assets/17851841/f55f13c3-0f79-4d38-a6d9-51444daf3c81)

### After

![image](https://github.com/Light-it-labs/lightranet/assets/17851841/38fd90e3-09e0-4af4-85e0-b8801d479f8c)


## 💬 Comments

<!--
Please describe any known issues, bugs, or unintended consequences with this change. Also, please include any additional comments you feel are relevant to the reviewer.
-->

Ex:
This pr is blocked by #1234.
Im awaiting backend changes to be merged before I can complete this, etc.
This
-->

## ✅ Checklist

- [ ] This PR can be merged (it is not a draft, work in progress, or blocked on another PR)
### To review
- [ ] I have tested this change locally in multiple screen sizes
- [ ] My code follows the style guidelines of this project
- [ ] I have performed a self-review of my own code
Expand Down
5 changes: 0 additions & 5 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,6 @@

version: 2
updates:
- package-ecosystem: "npm" # See documentation for possible values
directory: "/" # Location of package manifests
schedule:
interval: "weekly"

- package-ecosystem: "composer" # See documentation for possible values
directory: "/" # Location of package manifests
schedule:
Expand Down
38 changes: 38 additions & 0 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
feature:
- head-branch: ['^feature', 'feature']

bugfix:
- head-branch: [ '^bugfix', 'bugfix' ]

hotfix:
- head-branch: [ '^hotfix', 'hotfix' ]

release:
- base-branch: 'main'

have testing:
- changed-files:
- any-glob-to-any-file: tests/**

migrations:
- changed-files:
- any-glob-to-any-file: database/migrations/**

dependencies:
- changed-files:
- any-glob-to-any-file: ['composer.**', 'package.**', 'package-lock.**', 'poetry.lock', 'yarn.lock', 'pnpm-lock.**']

change env:
- changed-files:
- any-glob-to-any-file: '.env.**'

include command:
- changed-files:
- any-glob-to-any-file: 'src/Shared/App/Console/**'

documentation:
- changed-files:
- any-glob-to-any-file: ['README.**', 'docs/**']

refactor:
- head-branch: [ '^refactor', 'refactor' ]
133 changes: 133 additions & 0 deletions .github/workflows/build_and_deploy_dev.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,133 @@
# This workflow will build and push a new container image to Amazon ECR,
# and then will deploy a new task definition to Amazon ECS, when there is a push to the "master" branch.
#
# To use this workflow, you will need to complete the following set-up steps:
#
# 1. Create an ECR repository to store your images.
# For example: `aws ecr create-repository --repository-name my-ecr-repo --region us-east-2`.
# Replace the value of the `ECR_REPOSITORY` environment variable in the workflow below with your repository's name.
# Replace the value of the `AWS_REGION` environment variable in the workflow below with your repository's region.
#
# 2. Create an ECS task definition, an ECS cluster, and an ECS service.
# For example, follow the Getting Started guide on the ECS console:
# https://us-east-2.console.aws.amazon.com/ecs/home?region=us-east-2#/firstRun
# Replace the value of the `ECS_SERVICE` environment variable in the workflow below with the name you set for the Amazon ECS service.
# Replace the value of the `ECS_CLUSTER` environment variable in the workflow below with the name you set for the cluster.
#
# 3. Store your ECS task definition as a JSON file in your repository.
# The format should follow the output of `aws ecs register-task-definition --generate-cli-skeleton`.
# Replace the value of the `ECS_TASK_DEFINITION` environment variable in the workflow below with the path to the JSON file.
# Replace the value of the `CONTAINER_NAME` environment variable in the workflow below with the name of the container
# in the `containerDefinitions` section of the task definition.
#
# 4. Store an IAM user access key in GitHub Actions secrets named `AWS_ACCESS_KEY_ID` and `AWS_SECRET_ACCESS_KEY`.
# See the documentation for each action used below for the recommended IAM policies for this IAM user,
# and best practices on handling the access key credentials.

name: Deploy to Amazon ECS DEV

on:
workflow_dispatch:
push:
branches: ["develop"]

env:
ENVIRONMENT: dev
AWS_REGION: us-east-1 # set this to your preferred AWS region, e.g. us-west-1
ECR_REPOSITORY: REPLACEPROJECTNAME # set this to your Amazon ECR repository name
ECS_CLUSTER: REPLACEPROJECTNAME # set this to your Amazon ECS cluster name
# ECS_TASK_DEFINITION: MY_ECS_TASK_DEFINITION # set this to the path to your Amazon ECS task definition
# file, e.g. .aws/task-definition.json
CONTAINER_NAME:
REPLACEPROJECTNAME # set this to the name of the container in the
# containerDefinitions section of your task definition
DOCKER_PLATFORM: linux/amd64 # set this to the platform you want to build for
IMAGE_TAG: ${{ github.run_id }}-${{ github.run_attempt }}
REGISTRY_URL: <ECR URL>

permissions:
contents: read
id-token: write

jobs:
setup:
name: Deploy
runs-on: ubuntu-latest
# environment: dev # Works only on paid GH orgs

steps:
- name: Checkout
uses: actions/checkout@v4

- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@v4
with:
role-to-assume: arn:aws:iam::${{ secrets.AWS_ACCOUNT_ID }}:role/${{ vars.AWS_GITHUB_ACTIONS_ROLE }}
aws-region: ${{ env.AWS_REGION }}

- name: Login to Amazon ECR
id: login-ecr
uses: aws-actions/amazon-ecr-login@v2

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
with:
platforms: ${{ env.DOCKER_PLATFORM }}

- name: Set environment
uses: SpicyPizza/[email protected]
with:
envkey_VITE_APP_NAME: "${{ vars.VITE_APP_NAME }}"
envkey_VITE_SENTRY_DSN: "${{ vars.VITE_SENTRY_DSN }}"
envkey_VITE_SENTRY_ENVIRONMENT: "${{ vars.VITE_SENTRY_ENVIRONMENT }}"
envkey_VITE_API_URL: "${{ vars.VITE_API_URL }}"
envkey_VITE_APP_ENV: "${{ vars.VITE_APP_ENV }}"
envkey_VITE_APP_URL: "${{ vars.VITE_APP_URL }}"

file_name: .env

- name: Build and push
id: build-image
env:
ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}
uses: docker/build-push-action@v6
with:
context: .
push: true
platforms: ${{ env.DOCKER_PLATFORM }}
tags: ${{ env.ECR_REGISTRY }}/${{ env.ECR_REPOSITORY }}:${{ env.IMAGE_TAG }}
file: ./deployment/image/Dockerfile

deploy:
needs: setup
runs-on: ubuntu-latest
# environment: dev # Works only on paid GH orgs
strategy:
matrix:
service: [app]
steps:
- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@v4
with:
role-to-assume: arn:aws:iam::${{ secrets.AWS_ACCOUNT_ID }}:role/${{ vars.AWS_GITHUB_ACTIONS_ROLE }}
aws-region: ${{ env.AWS_REGION }}

- name: Download task def
run: |
aws ecs describe-task-definition --task-definition ${{ matrix.service }}_task_definition_${{ env.ECR_REPOSITORY }} --query taskDefinition > task-definition.json

- name: Fill in the new image ID in the Amazon ECS task definition
id: task-def
uses: aws-actions/amazon-ecs-render-task-definition@v1
with:
task-definition: task-definition.json
container-name: ${{ env.CONTAINER_NAME }}
image: ${{ env.REGISTRY_URL }}/${{ env.ECR_REPOSITORY }}:${{ env.IMAGE_TAG }}

- name: Deploy Amazon ECS task definition
uses: aws-actions/amazon-ecs-deploy-task-definition@v2
with:
task-definition: ${{ steps.task-def.outputs.task-definition }}
service: ${{ matrix.service }}_service_${{ env.ECR_REPOSITORY }}
cluster: ${{ env.ECS_CLUSTER }}
wait-for-service-stability: false
12 changes: 0 additions & 12 deletions .github/workflows/issues.yml

This file was deleted.

12 changes: 0 additions & 12 deletions .github/workflows/pull-requests.yml

This file was deleted.

Loading