Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: wulfland/AccelerateDevOps
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.4
Choose a base ref
...
head repository: wulfland/AccelerateDevOps
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: main
Choose a head ref
Loading
30 changes: 15 additions & 15 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
version: 2
updates:
- package-ecosystem: "npm"
directory: "ch9_release/src/Tailwind.Traders.Web/ClientApp"
schedule:
interval: "daily"
open-pull-requests-limit: 50
# - package-ecosystem: "npm"
# directory: "ch9_release/src/Tailwind.Traders.Web/ClientApp"
# schedule:
# interval: "daily"
# open-pull-requests-limit: 50

- package-ecosystem: "npm"
directory: "ch8_packages/npm"
schedule:
interval: "daily"
open-pull-requests-limit: 5
# - package-ecosystem: "npm"
# directory: "ch8_packages/npm"
# schedule:
# interval: "daily"
# open-pull-requests-limit: 5

- package-ecosystem: "nuget"
directory: "ch9_release/src/Tailwind.Traders.Web"
schedule:
interval: "daily"
open-pull-requests-limit: 15
# - package-ecosystem: "nuget"
# directory: "ch9_release/src/Tailwind.Traders.Web"
# schedule:
# interval: "daily"
# open-pull-requests-limit: 15

- package-ecosystem: "docker"
directory: "ch9_release/src/Tailwind.Traders.Web"
12 changes: 6 additions & 6 deletions .github/workflows/Deploy-AWS.yml
Original file line number Diff line number Diff line change
@@ -18,10 +18,10 @@ jobs:

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

- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@v1
uses: aws-actions/configure-aws-credentials@v4
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
@@ -30,7 +30,7 @@ jobs:

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

- name: Build, tag, and push image to Amazon ECR
id: build-image
@@ -43,7 +43,7 @@ jobs:
echo "Build and push $imagename"
docker build -t $imagename .
docker push $imagename
echo "::set-output name=image::$imagename"
echo "image=$imagename" >> $GITHUB_OUTPUT
Deploy:
runs-on: ubuntu-latest
@@ -52,10 +52,10 @@ jobs:

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

- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@v1
uses: aws-actions/configure-aws-credentials@v4
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
14 changes: 7 additions & 7 deletions .github/workflows/Deploy-Azure.yml
Original file line number Diff line number Diff line change
@@ -11,15 +11,15 @@ jobs:

steps:
- name: 'Checkout Github Action'
uses: actions/checkout@master
uses: actions/checkout@v4

- name: Set up .NET Core
uses: actions/setup-dotnet@v1
uses: actions/setup-dotnet@v4
with:
dotnet-version: '5.0.x'

- name: Setup Node
uses: actions/setup-node@v2.5.1
uses: actions/setup-node@v4.0.3
with:
node-version: 10.16.3

@@ -34,7 +34,7 @@ jobs:
dotnet publish -c Release -o publish
- name: Upload Artifact
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: website
path: ch9_release/src/Tailwind.Traders.Web/publish
@@ -46,15 +46,15 @@ jobs:

steps:
- name: 'Checkout Github Action'
uses: actions/checkout@master
uses: actions/checkout@v4

- uses: actions/download-artifact@v2
- uses: actions/download-artifact@v4
with:
name: website
path: website

- name: Run Azure webapp deploy action using publish profile credentials
uses: azure/webapps-deploy@v2
uses: azure/webapps-deploy@v3
with:
app-name: ${{ env.appName }}
slot-name: Production
10 changes: 5 additions & 5 deletions .github/workflows/Deploy-GKE.yml
Original file line number Diff line number Diff line change
@@ -18,10 +18,10 @@ jobs:

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

# Setup gcloud CLI
- uses: google-github-actions/setup-gcloud@v0.3
- uses: google-github-actions/setup-gcloud@v2.1.0
with:
service_account_key: ${{ secrets.GKE_SA_KEY }}
project_id: ${{ secrets.GKE_PROJECT }}
@@ -46,17 +46,17 @@ jobs:

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

# Setup gcloud CLI
- uses: google-github-actions/setup-gcloud@v0.3
- uses: google-github-actions/setup-gcloud@v2.1.0
with:
service_account_key: ${{ secrets.GKE_SA_KEY }}
project_id: ${{ secrets.GKE_PROJECT }}
export_default_credentials: true

# Get the GKE credentials so we can deploy to the cluster
- uses: google-github-actions/get-gke-credentials@v0.5.0
- uses: google-github-actions/get-gke-credentials@v2.1.0
with:
cluster_name: ${{ env.GKE_CLUSTER }}
location: ${{ env.GKE_ZONE }}
4 changes: 2 additions & 2 deletions .github/workflows/Linter.yml
Original file line number Diff line number Diff line change
@@ -9,12 +9,12 @@ jobs:

steps:
- name: Checkout Code
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Lint Code Base
uses: github/super-linter@v4
uses: github/super-linter@v6
env:
VALIDATE_ALL_CODEBASE: true
DEFAULT_BRANCH: main
2 changes: 1 addition & 1 deletion .github/workflows/StagedDeployment.yml
Original file line number Diff line number Diff line change
@@ -32,7 +32,7 @@ jobs:
runs-on: ubuntu-latest
needs: [Test, Load-Test]
environment:
name: pre-prod
name: Staging
url: https://pre.writeabout.net
steps:
- name: Deploy app
2 changes: 1 addition & 1 deletion .github/workflows/auto-merge.yml
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@ jobs:
steps:
- name: Dependabot metadata
id: dependabot-metadata
uses: dependabot/fetch-metadata@v1.1.1
uses: dependabot/fetch-metadata@v2.2.0
with:
github-token: "${{ secrets.GITHUB_TOKEN }}"

4 changes: 2 additions & 2 deletions .github/workflows/caching.yml
Original file line number Diff line number Diff line change
@@ -7,11 +7,11 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Cache Primes
id: cache-primes
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: primes
key: ${{ runner.os }}-primes
4 changes: 2 additions & 2 deletions .github/workflows/checkov.yml
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ jobs:

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

- name: Checkov GitHub Action
uses: bridgecrewio/checkov-action@master
@@ -18,7 +18,7 @@ jobs:
output_format: sarif

- name: Upload SARIF file
uses: github/codeql-action/upload-sarif@v1
uses: github/codeql-action/upload-sarif@v3
with:
sarif_file: results.sarif
if: always()
12 changes: 6 additions & 6 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
@@ -26,27 +26,27 @@ jobs:

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

- name: Initialize CodeQL
uses: github/codeql-action/init@v1
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
queries: security-and-quality
# queries: ./path/to/local/query, your-org/your-repo/queries@main

- name: Set up .NET Core
uses: actions/setup-dotnet@v1
uses: actions/setup-dotnet@v4
with:
dotnet-version: '5.0.x'

- name: Setup Node
uses: actions/setup-node@v2.5.1
uses: actions/setup-node@v4.0.3
with:
node-version: 10.16.3

- name: Autobuild
uses: github/codeql-action/autobuild@v1
uses: github/codeql-action/autobuild@v3

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
uses: github/codeql-action/analyze@v3
6 changes: 3 additions & 3 deletions .github/workflows/dast.yml
Original file line number Diff line number Diff line change
@@ -11,19 +11,19 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: ZAP Scan
uses: zaproxy/action-baseline@v0.6.1
uses: zaproxy/action-baseline@v0.12.0
with:
token: ${{ secrets.GITHUB_TOKEN }}
docker_name: 'owasp/zap2docker-stable'
target: ${{ env.TARGET_URL }}

- name: OWASP ZAP Full Scan
uses: zaproxy/action-full-scan@v0.3.0
uses: zaproxy/action-full-scan@v0.10.0
with:
target: ${{ env.TARGET_URL }}

- name: OWASP ZAP API Scan
uses: zaproxy/action-api-scan@v0.1.0
uses: zaproxy/action-api-scan@v0.7.0
with:
target: ${{ env.TARGET_API }}

20 changes: 20 additions & 0 deletions .github/workflows/dependency-review.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Dependency Review Action
#
# This Action will scan dependency manifest files that change as part of a Pull Reqest, surfacing known-vulnerable versions of the packages declared or updated in the PR. Once installed, if the workflow run is marked as required, PRs introducing known-vulnerable packages will be blocked from merging.
#
# Source repository: https://github.com/actions/dependency-review-action
# Public documentation: https://docs.github.com/en/code-security/supply-chain-security/understanding-your-software-supply-chain/about-dependency-review#dependency-review-enforcement
name: 'Dependency Review'
on: [pull_request]

permissions:
contents: read

jobs:
dependency-review:
runs-on: ubuntu-latest
steps:
- name: 'Checkout Repository'
uses: actions/checkout@v4
- name: 'Dependency Review'
uses: actions/dependency-review-action@v4
31 changes: 31 additions & 0 deletions .github/workflows/job_summaries.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
name: Job Summaries

on: [workflow_dispatch]

jobs:
job1:
runs-on: ubuntu-latest

steps:
- run: echo '### Hello world! :rocket:' >> $GITHUB_STEP_SUMMARY
- run: echo '### Love this feature! :medal_sports:' >> $GITHUB_STEP_SUMMARY
- run: echo '<h1>Great feature!</h1>' >> $GITHUB_STEP_SUMMARY

job2:
runs-on: ubuntu-latest

steps:
- name: Write Summary from Action
uses: actions/github-script@v7.0.1
with:
script: |
await core.summary
.addHeading('Test Results')
.addTable([
[{data: 'File', header: true}, {data: 'Result', header: true}],
['foo.js', 'Pass ✅'],
['bar.js', 'Fail ❌'],
['test.js', 'Pass ✅']
])
.addLink('View staging deployment!', 'https://github.com')
.write()
10 changes: 5 additions & 5 deletions .github/workflows/openid-connect.yml
Original file line number Diff line number Diff line change
@@ -15,15 +15,15 @@ jobs:
steps:

- name: 'Checkout Github Action'
uses: actions/checkout@master
uses: actions/checkout@v4

- name: Set up .NET Core
uses: actions/setup-dotnet@v1
uses: actions/setup-dotnet@v4
with:
dotnet-version: '5.0.x'

- name: Setup Node
uses: actions/setup-node@v2.5.1
uses: actions/setup-node@v4.0.3
with:
node-version: 10.16.3

@@ -38,14 +38,14 @@ jobs:
dotnet publish -c Release -o publish
- name: 'Az CLI login'
uses: azure/login@v1
uses: azure/login@v2
with:
client-id: ${{ secrets.AZURE_CLIENT_ID }}
tenant-id: ${{ secrets.AZURE_TENANT_ID }}
subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}

- name: Run Azure webapp deploy action using publish profile credentials
uses: azure/webapps-deploy@v2
uses: azure/webapps-deploy@v3
with:
app-name: ${{ secrets.APPNAME }}
slot-name: Production
8 changes: 4 additions & 4 deletions .github/workflows/pr-validation.yml
Original file line number Diff line number Diff line change
@@ -8,17 +8,17 @@ jobs:

steps:
- name: 'Checkout Github Action'
uses: actions/checkout@master
uses: actions/checkout@v4

- name: Set up .NET Core
uses: actions/setup-dotnet@v1
uses: actions/setup-dotnet@v4
with:
dotnet-version: '5.0.x'

- name: Setup Node
uses: actions/setup-node@v2.5.1
uses: actions/setup-node@v4.0.3
with:
node-version: 10.16.3
node-version: 21.x

- name: Install dependencies in client app
working-directory: ch9_release/src/Tailwind.Traders.Web/ClientApp
Loading