Skip to content

Commit

Permalink
fix: makefile, formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
lotyp committed Mar 21, 2023
1 parent e9ac7bb commit ed94aa3
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 9 deletions.
1 change: 1 addition & 0 deletions .github/workflows/ci-apps-web.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
---
on: # yamllint disable-line rule:truthy
merge_group:
push:
branches:
- master
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/ci-packages.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
---
on: # yamllint disable-line rule:truthy
merge_group:
push:
branches:
- master
Expand Down
13 changes: 6 additions & 7 deletions .github/workflows/codeql-analysis.yml.dist
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---

on: # yamllint disable-line rule:truthy
on: # yamllint disable-line rule:truthy
push:
branches:
- master
Expand All @@ -10,11 +10,10 @@ on: # yamllint disable-line rule:truthy
schedule:
- cron: '22 6 * * 0'

name: CodeQL
name: 🐞 CodeQL

jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest
permissions:
actions: read
Expand All @@ -28,18 +27,18 @@ jobs:
- javascript

steps:
- name: Checkout repository
- name: 📦 Check out the codebase
uses: actions/checkout@v3

- name: Initialize CodeQL
- name: 🤖 Initialize CodeQL
uses: github/codeql-action/init@v2
with:
languages: ${{ matrix.language }}

- name: Autobuild
- name: 🛠️ Autobuild
uses: github/codeql-action/autobuild@v2

- name: Perform CodeQL Analysis
- name: 🚨 Perform CodeQL analysis
uses: github/codeql-action/analyze@v2

...
2 changes: 1 addition & 1 deletion .github/workflows/release-or-version-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,5 +51,5 @@ jobs:
env:
# See https://github.com/changesets/action/issues/147
HOME: ${{ github.workspace }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_TOKEN: ${{ secrets.PERSONAL_GITHUB_TOKEN }}
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
6 changes: 5 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,11 @@ DOCKER_COMPOSE ?= docker-compose
# Support image with all needed binaries, like envsubst, mkcert, wait4x
SUPPORT_IMAGE ?= wayofdev/build-deps:alpine-latest

BUILDER_PARAMS ?= docker run --rm -i \
BUILDER_PARAMS ?= docker run \
--rm \
-i \
-v $(PWD):/app \
--workdir /app \
--env-file ./.env \
--env APP_NAME=$(APP_NAME) \
--env SYSTEM_SERVICES_NAMESPACE=$(SYSTEM_SERVICES_NAMESPACE) \
Expand Down

0 comments on commit ed94aa3

Please sign in to comment.