From d3ce634b6214728bdf0fbc3a0b67c1d220c02518 Mon Sep 17 00:00:00 2001 From: Dusko Vukmanovic Date: Thu, 14 Dec 2017 12:28:27 +0100 Subject: [PATCH 1/5] Commited changes. --- EasyMock/src/com/nirman/easymock/Retailer.java | 4 ++++ JavaPowershell/.gitignore | 3 +++ 2 files changed, 7 insertions(+) create mode 100644 JavaPowershell/.gitignore diff --git a/EasyMock/src/com/nirman/easymock/Retailer.java b/EasyMock/src/com/nirman/easymock/Retailer.java index ef001ef..e4b1284 100644 --- a/EasyMock/src/com/nirman/easymock/Retailer.java +++ b/EasyMock/src/com/nirman/easymock/Retailer.java @@ -26,4 +26,8 @@ private int getPrice(int basePrice) { public int getTaxRate() { return taxes_in_percent; } + + public String myTaxRate() { + return "100%"; + } } diff --git a/JavaPowershell/.gitignore b/JavaPowershell/.gitignore new file mode 100644 index 0000000..80ab9f4 --- /dev/null +++ b/JavaPowershell/.gitignore @@ -0,0 +1,3 @@ +/src/ +/bin/ + From 945237544fe45e20cb2837441c1792edd1934d5a Mon Sep 17 00:00:00 2001 From: Dusko Vukmanovic Date: Thu, 14 Dec 2017 12:31:34 +0100 Subject: [PATCH 2/5] commit2 --- EasyMock/src/com/nirman/easymock/Customer.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/EasyMock/src/com/nirman/easymock/Customer.java b/EasyMock/src/com/nirman/easymock/Customer.java index 485b33d..ad37aba 100644 --- a/EasyMock/src/com/nirman/easymock/Customer.java +++ b/EasyMock/src/com/nirman/easymock/Customer.java @@ -25,4 +25,6 @@ public void setRetailer(Retailer retailer) { this.retailer = retailer; } + //comment in branch + } From 28e3ac49bead61a75503f75acc88984eb5672a76 Mon Sep 17 00:00:00 2001 From: Dusko Vukmanovic Date: Thu, 15 Apr 2021 20:21:52 +0200 Subject: [PATCH 3/5] Add or update the App Service deployment workflow configuration from Azure Portal. --- .github/workflows/master_dvuk1test.yml | 53 ++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 .github/workflows/master_dvuk1test.yml diff --git a/.github/workflows/master_dvuk1test.yml b/.github/workflows/master_dvuk1test.yml new file mode 100644 index 0000000..9012a5b --- /dev/null +++ b/.github/workflows/master_dvuk1test.yml @@ -0,0 +1,53 @@ +# 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 - dvuk1test + +on: + push: + branches: + - master + workflow_dispatch: + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + + - name: Set up Java version + uses: actions/setup-java@v1 + with: + java-version: '11' + + - name: Build with Maven + run: mvn clean install + + - name: Upload artifact for deployment job + uses: actions/upload-artifact@v2 + with: + name: java-app + path: '${{ github.workspace }}/target/*.jar' + + deploy: + runs-on: ubuntu-latest + needs: build + environment: + name: 'production' + url: ${{ steps.deploy-to-webapp.outputs.webapp-url }} + + steps: + - name: Download artifact from build job + uses: actions/download-artifact@v2 + with: + name: java-app + + - name: Deploy to Azure Web App + id: deploy-to-webapp + uses: azure/webapps-deploy@v2 + with: + app-name: 'dvuk1test' + slot-name: 'production' + publish-profile: ${{ secrets.AzureAppService_PublishProfile_e413877bbc0f40d08e3babe5253b3871 }} + package: '*.jar' \ No newline at end of file From 68f0d6b4f8df1f922ddd57b948386678c8615db1 Mon Sep 17 00:00:00 2001 From: Dusko Vukmanovic Date: Fri, 16 Apr 2021 12:20:17 +0200 Subject: [PATCH 4/5] Add or update the App Service deployment workflow configuration from Azure Portal. --- .github/workflows/master_dvuk1test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/master_dvuk1test.yml b/.github/workflows/master_dvuk1test.yml index 9012a5b..46e1d6a 100644 --- a/.github/workflows/master_dvuk1test.yml +++ b/.github/workflows/master_dvuk1test.yml @@ -49,5 +49,5 @@ jobs: with: app-name: 'dvuk1test' slot-name: 'production' - publish-profile: ${{ secrets.AzureAppService_PublishProfile_e413877bbc0f40d08e3babe5253b3871 }} + publish-profile: ${{ secrets.AzureAppService_PublishProfile_6a050017db044babb099da4bf3ad62b2 }} package: '*.jar' \ No newline at end of file From 30e21ad7fcfb3369bc36e76e520ff56996490d43 Mon Sep 17 00:00:00 2001 From: Dusko Vukmanovic Date: Thu, 17 Jun 2021 17:52:59 +0200 Subject: [PATCH 5/5] Set up CI with Azure Pipelines [skip ci] --- azure-pipelines.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 azure-pipelines.yml diff --git a/azure-pipelines.yml b/azure-pipelines.yml new file mode 100644 index 0000000..27a798a --- /dev/null +++ b/azure-pipelines.yml @@ -0,0 +1,19 @@ +# Starter pipeline +# Start with a minimal pipeline that you can customize to build and deploy your code. +# Add steps that build, run tests, deploy, and more: +# https://aka.ms/yaml + +trigger: +- master + +pool: + vmImage: ubuntu-latest + +steps: +- script: echo Hello, world! + displayName: 'Run a one-line script' + +- script: | + echo Add other tasks to build, test, and deploy your project. + echo See https://aka.ms/yaml + displayName: 'Run a multi-line script'