Updated workflow

nenad0707 · Jun 4, 2024 · dddec21 · dddec21
1 parent 3ada237
commit dddec21
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/.github/workflows/azure-static-web-apps-proud-meadow-0ae800f0f.yml b/.github/workflows/azure-static-web-apps-proud-meadow-0ae800f0f.yml
@@ -19,8 +19,15 @@ jobs:
         with:
           submodules: true
           lfs: false
-      - name: Build And Deploy
-        id: builddeploy
+      - name: Set up .NET Core
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: "6.0.x" # ili verzija koju koristite
+      - name: Restore dependencies
+        run: dotnet restore ./TaskTackler
+      - name: Build
+        run: dotnet build --configuration Release --no-restore ./TaskTackler
+      - name: Deploy
         uses: Azure/static-web-apps-deploy@v1
         with:
           azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN }}
@@ -29,15 +36,14 @@ jobs:
           app_location: "./TaskTackler" # App source code path
           output_location: "wwwroot" # Built app content directory - optional
         env:
-          ApiUrl: ${{secrets.API_URL}}
+          ApiUrl: ${{ secrets.API_URL }}
 
   close_pull_request_job:
     if: github.event_name == 'pull_request' && github.event.action == 'closed'
     runs-on: ubuntu-latest
     name: Close Pull Request Job
     steps:
       - name: Close Pull Request
-        id: closepullrequest
         uses: Azure/static-web-apps-deploy@v1
         with:
           azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN }}

diff --git a/TaskTackler/Program.cs b/TaskTackler/Program.cs
@@ -14,8 +14,10 @@
 builder.Services.AddScoped<AuthorizationMessageHandler>();
 builder.Services.AddScoped<CachingHandler>();
 
+var apiUrl = Environment.GetEnvironmentVariable("ApiUrl")
+             ?? builder.Configuration.GetValue<string>("ApiUrl")
+             ?? "https://localhost:7213/api/";
 
-var apiUrl = builder.Configuration.GetValue<string>("ApiUrl") ?? "https://localhost:7213/api/";
 builder.Services.AddHttpClient("api", client =>
 {
     client.BaseAddress = new Uri(apiUrl);