Skip to content

Commit

Permalink
actions updates.
Browse files Browse the repository at this point in the history
  • Loading branch information
goncalvesj committed Jul 25, 2024
1 parent a4754d5 commit 424c743
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 35 deletions.
41 changes: 14 additions & 27 deletions .github/workflows/dapr-on-aca.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,6 @@ on:
push:
branches: ['features/dapr-aca-k8s-arc-apps']
workflow_dispatch:
inputs:
tags:
description: 'Test scenario'
required: false
type: boolean

env:
APP_CONTEXT: 'Azure-ContainerApps-Dapr'
Expand All @@ -24,21 +19,13 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3

- name: Initialize CodeQL
uses: github/codeql-action/init@v2
with:
languages: csharp
uses: actions/checkout@v4

- name: Build
run: |
cd ${{ env.APP_CONTEXT }}/Dapr.Api1
dotnet restore
dotnet build
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
for proj in $(find . -name "*.csproj"); do
dotnet build "$proj"
done
deploy-daprsender-api-ghcr:
uses: ./.github/workflows/reusable-push-to-ghcr.yml
Expand All @@ -47,17 +34,17 @@ jobs:
with:
image-tag: aca-dapr-sender-api
build-context: Azure-ContainerApps-Dapr #Doesnt accept global env variables as input
dockerfile-location: Dapr.Api1/Dockerfile
dockerfile-location: Dapr.Sender.Api/Dockerfile
secrets: inherit
permissions:
packages: write

deploy-daprsender-api-aca:
uses: ./.github/workflows/reusable-deploy-to-aca.yml
needs: deploy-daprsender-api-ghcr
name: deploy dapr sender api
with:
image-tag: aca-dapr-sender-api
aca-name: dapr-app-1
resource-group: JPRG-ALZ-LZ2
secrets: inherit
# deploy-daprsender-api-aca:
# uses: ./.github/workflows/reusable-deploy-to-aca.yml
# needs: deploy-daprsender-api-ghcr
# name: deploy dapr sender api
# with:
# image-tag: aca-dapr-sender-api
# aca-name: dapr-app-1
# resource-group: JPRG-ALZ-LZ2
# secrets: inherit
15 changes: 7 additions & 8 deletions .github/workflows/k8s-on-arc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,6 @@ on:
push:
branches: ['features/dapr-aca-k8s-arc-apps']
workflow_dispatch:
inputs:
tags:
description: 'Test scenario'
required: false
type: boolean

env:
APP_CONTEXT: 'Azure-K8S-On-Arc'
Expand All @@ -22,11 +17,13 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Use Node.js
uses: actions/setup-node@v3
with:
node-version: 14.x

- name: Build
run: |
cd ${{ env.APP_CONTEXT }}/node-api
Expand All @@ -39,7 +36,8 @@ jobs:
input: environment variable
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Build
run: |
cd ${{ env.APP_CONTEXT }}/python-api
Expand All @@ -51,7 +49,8 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Build
run: |
cd ${{ env.APP_CONTEXT }}/dotnet-api
Expand Down

0 comments on commit 424c743

Please sign in to comment.