diff --git a/.github/workflows/main_sh-crescendo-server.yml b/.github/workflows/main_sh-crescendo-server.yml index 8f79a1b..2e629cc 100644 --- a/.github/workflows/main_sh-crescendo-server.yml +++ b/.github/workflows/main_sh-crescendo-server.yml @@ -1,7 +1,7 @@ # Docs for the Azure Web Apps Deploy action: https://github.com/Azure/webapps-deploy # More GitHub Actions for Azure: https://github.com/Azure/actions -name: Build and deploy JAR app to Azure Web App - sh-crescendo-server +name: Build and deploy WAR app to Azure Web App - sh-study-azure on: push: @@ -22,14 +22,17 @@ jobs: java-version: '17' distribution: 'microsoft' - - name: Build with Maven - run: mvn clean install + - name: Build with Gradle + run: ./gradlew bootJar + + - name: check build completed + run: ls -al build/libs - name: Upload artifact for deployment job uses: actions/upload-artifact@v4 with: name: java-app - path: '${{ github.workspace }}/target/*.jar' + path: 'build/libs/crescendo-server-0.0.1-SNAPSHOT.jar' deploy: runs-on: ubuntu-latest @@ -37,27 +40,28 @@ jobs: environment: name: 'Production' url: ${{ steps.deploy-to-webapp.outputs.webapp-url }} - permissions: - id-token: write #This is required for requesting the JWT - + permissions: + id-token: write #This is required for requesting the JWT + steps: - name: Download artifact from build job uses: actions/download-artifact@v4 with: name: java-app - - - name: Login to Azure - uses: azure/login@v2 - with: - client-id: ${{ secrets.AZUREAPPSERVICE_CLIENTID_D59EDC969DD64B72AFD452B673A10F06 }} - tenant-id: ${{ secrets.AZUREAPPSERVICE_TENANTID_5D4409B83378496FA3C9DFC1CD276C15 }} - subscription-id: ${{ secrets.AZUREAPPSERVICE_SUBSCRIPTIONID_3175DEB86B40415481768E3535122B96 }} + + - name: Check Download Complete + run: ls -al + + - name: Login to Azure + uses: azure/login@v2 + with: + client-id: ${{ secrets.AZUREAPPSERVICE_CLIENTID_07128A1682B3405E98BDB9D85E90E1ED }} + tenant-id: ${{ secrets.AZUREAPPSERVICE_TENANTID_23B73E15708D435E900E878954B94E7E }} + subscription-id: ${{ secrets.AZUREAPPSERVICE_SUBSCRIPTIONID_794754373FBF456596BF1C34BA681B3C }} - name: Deploy to Azure Web App id: deploy-to-webapp uses: azure/webapps-deploy@v3 with: - app-name: 'sh-crescendo-server' - slot-name: 'Production' - package: '*.jar' - \ No newline at end of file + app-name: 'sh-crescendo' + package: 'crescendo-server-0.0.1-SNAPSHOT.jar' \ No newline at end of file diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..13566b8 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,8 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/.idea/material_theme_project_new.xml b/.idea/material_theme_project_new.xml new file mode 100644 index 0000000..9e62366 --- /dev/null +++ b/.idea/material_theme_project_new.xml @@ -0,0 +1,13 @@ + + + + + + \ No newline at end of file