Merge branch 'main' into patch-2

deployments/azure-webapps-java-jar-gradle.yml

@@ -0,0 +1,79 @@
+# This workflow will build and push a Java application to an Azure Web App when a commit is pushed to your default branch.
+#
+# This workflow assumes you have already created the target Azure App Service web app.
+# For instructions see https://docs.microsoft.com/en-us/azure/app-service/quickstart-java?tabs=javase&pivots=platform-linux
+#
+# To configure this workflow:
+#
+# 1. Download the Publish Profile for your Azure Web App. You can download this file from the Overview page of your Web App in the Azure Portal.
+#    For more information: https://docs.microsoft.com/en-us/azure/app-service/deploy-github-actions?tabs=applevel#generate-deployment-credentials
+#
+# 2. Create a secret in your repository named AZURE_WEBAPP_PUBLISH_PROFILE, paste the publish profile contents as the value of the secret.
+#    For instructions on obtaining the publish profile see: https://docs.microsoft.com/azure/app-service/deploy-github-actions#configure-the-github-secret
+#
+# 3. Change the value for the AZURE_WEBAPP_NAME. Optionally, change the JAVA_VERSION environment variable below.
+#
+# For more information on GitHub Actions for Azure: https://github.com/Azure/Actions
+# For more information on the Azure Web Apps Deploy action: https://github.com/Azure/webapps-deploy
+# For more samples to get started with GitHub Action workflows to deploy to Azure: https://github.com/Azure/actions-workflow-samples
+
+name: Build and deploy Gradle app to Azure Web App
+
+env:
+  AZURE_WEBAPP_NAME: your-app-name    # set this to the name of your Azure Web App
+  JAVA_VERSION: '11'                  # set this to the Java version to use
+  DISTRIBUTION: zulu                  # set this to the Java distribution
+
+on:
+  push:
+    branches: [ $default-branch ]
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Set up Java version
+        uses: actions/setup-java@v3.0.0
+        with:
+          java-version: ${{ env.JAVA_VERSION }}
+          distribution: ${{ env.DISTRIBUTION }}
+          cache: 'gradle'
+
+      - name: Build with Gradle
+        run: gradle build
+
+      - name: Upload artifact for deployment job
+        uses: actions/upload-artifact@v3
+        with:
+          name: java-app
+          path: '${{ github.workspace }}/build/libs/*.jar'
+
+  deploy:
+    permissions:
+      contents: none
+    runs-on: ubuntu-latest
+    needs: build
+    environment:
+      name: 'Development'
+      url: ${{ steps.deploy-to-webapp.outputs.webapp-url }}
+
+    steps:
+      - name: Download artifact from build job
+        uses: actions/download-artifact@v3
+        with:
+          name: java-app
+
+      - name: Deploy to Azure Web App
+        id: deploy-to-webapp
+        uses: azure/webapps-deploy@v2
+        with:
+          app-name: ${{ env.AZURE_WEBAPP_NAME }}
+          publish-profile: ${{ secrets.AZURE_WEBAPP_PUBLISH_PROFILE }}
+          package: '*.jar'

deployments/properties/azure-webapps-java-jar-gradle.properties.json

@@ -0,0 +1,8 @@
+{
+    "name": "Deploy a Gradle .jar app to an Azure Web App",
+    "description": "Build a Gradle project and deploy it to an Azure Web App.",
+    "creator": "Microsoft Azure",
+    "iconName": "azure",
+    "categories": ["Deployment", "Java", "Gradle"],
+    "labels": ["preview"]
+}

pages/jekyll.yml

@@ -35,7 +35,7 @@ jobs:
       - name: Setup Ruby
         uses: ruby/setup-ruby@ee2113536afb7f793eed4ce60e8d3b26db912da4 # v1.127.0
         with:
-          ruby-version: '3.0' # Not needed with a .ruby-version file
+          ruby-version: '3.1' # Not needed with a .ruby-version file
           bundler-cache: true # runs 'bundle install' and caches installed gems automatically
           cache-version: 0 # Increment this number if you need to re-download cached gems
       - name: Setup Pages

pages/mdbook.yml

@@ -1,8 +1,8 @@
-# Sample workflow for building and deploying a mdbook site to GitHub Pages
+# Sample workflow for building and deploying a mdBook site to GitHub Pages
 #
-# To get started with mdbook see: https://rust-lang.github.io/mdBook/index.html
+# To get started with mdBook see: https://rust-lang.github.io/mdBook/index.html
 #
-name: Deploy mdbook site to Pages
+name: Deploy mdBook site to Pages
 
 on:
   # Runs on pushes targeting the default branch
@@ -38,14 +38,14 @@ jobs:
       # Runs a single command using the runners shell
       - name: install mdbook
         run: |
-          curl --proto '=https' --tlsv1.2 https://sh.rustup.rs -sSf -y | sh 
+          curl --proto '=https' --tlsv1.2 https://sh.rustup.rs -sSf -y | sh
           rustup update
           cargo install --version ${MDBOOK_VERSION} mdbook
       - name: Setup Pages
         id: pages
         uses: actions/configure-pages@v1
       - name: Build with mdbook
-        run: mdbook build 
+        run: mdbook build
       - name: Upload artifact
         uses: actions/upload-pages-artifact@v1
         with:

pages/properties/mdbook.properties.json

@@ -1,6 +1,6 @@
 {
-    "name": "Mdbook",
-    "description": "Package a Mdbook site.",
+    "name": "mdBook",
+    "description": "Package a site using mdBook.",
     "iconName": "mdbook",
-    "categories": ["Pages", "Mdbook"]
+    "categories": ["Pages", "mdBook"]
 }