Skip to content

Commit

Permalink
merge dev into staging
Browse files Browse the repository at this point in the history
  • Loading branch information
dweinholz committed Apr 10, 2024
2 parents 0945f34 + 35633bc commit 5bee412
Show file tree
Hide file tree
Showing 78 changed files with 10,252 additions and 11,736 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/LintingAutoFix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
- name: Create Pull Request
if: steps.git-check.outputs.modified == 'true'
id: cpr
uses: peter-evans/create-pull-request@v5.0.2
uses: peter-evans/create-pull-request@v6.0.2
with:
token: ${{ secrets.GITHUB_TOKEN }}
commit-message: fix(Linting):blacked code
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/WikiLinks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ jobs:
- uses: actions/checkout@v4
- name: Checking if Wiki Links return Code 200
run: |
bash src/links/check_links.sh
echo $?
6 changes: 3 additions & 3 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
queries: +security-extended, security-and-quality
Expand All @@ -51,7 +51,7 @@ jobs:
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v2
uses: github/codeql-action/autobuild@v3

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl
Expand All @@ -65,4 +65,4 @@ jobs:
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3
2 changes: 1 addition & 1 deletion .github/workflows/playwright.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
run: npx playwright install --with-deps
- name: Run Playwright tests
run: npx playwright test
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
if: always()
with:
name: playwright-test-results
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ COPY . .
RUN $(npm bin)/ng build --configuration=custom --build-optimizer

### STAGE 2: Setup ###
FROM nginx:1.25.3-alpine
FROM nginx:1.25.4-alpine

## Copy our default nginx config
COPY nginx/default.conf /etc/nginx/conf.d/
Expand Down
6 changes: 3 additions & 3 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -121,17 +121,17 @@
"builder": "@angular-devkit/build-angular:dev-server",
"defaultConfiguration": "",
"options": {
"browserTarget": "cloud-webapp:build:development",
"port": 8001,
"host": "localhost",
"ssl": false
"ssl": false,
"buildTarget": "cloud-webapp:build:development"
},
"configurations": {}
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"options": {
"browserTarget": "cloud-webapp:build"
"buildTarget": "cloud-webapp:build"
}
},
"test": {
Expand Down
Loading

0 comments on commit 5bee412

Please sign in to comment.