Merge pull request #3165 from dzhw/moellerth/issue3157

#3157 updated github runner image version to 22.04
dzhw · Dec 16, 2022 · e036aea · e036aea
2 parents 116395b + c24f98e
commit e036aea
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 24 deletions.
diff --git a/.github/workflows/build-and-deploy.yml b/.github/workflows/build-and-deploy.yml
@@ -11,15 +11,16 @@ on:
       - 'docs/**'
 jobs:
   build-and-deploy:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up JDK 15
-      uses: actions/setup-java@v1
+      uses: actions/setup-java@v3
       with:
+        distribution: 'adopt'
         java-version: 15
     - name: Cache maven artifacts
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       env:
         cache-name: cache-maven-artifacts
       with:
@@ -30,12 +31,12 @@ jobs:
       run: pip install awscli
     - name: Install jq for commandline json parsing
       run: sudo apt-get -y install jq --allow-unauthenticated
-    - name: Set up node 14.17.6
-      uses: actions/setup-node@v2.1.2
+    - name: Set up node 16
+      uses: actions/setup-node@v3
       with:
-        node-version: 14.17.6
+        node-version: 16
     - name: Cache node modules
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       env:
         cache-name: cache-node-modules
       with:
@@ -44,10 +45,11 @@ jobs:
         key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
     - name: Install Grunt globally
       run: npm install -g grunt-cli
-    - name: Get branch name
-      uses: nelonoel/branch-name@v1.0.1
+    - name: Extract branch name
+      shell: bash
+      run: echo "BRANCH=$(echo ${GITHUB_REF#refs/heads/})" >> $GITHUB_ENV
     - name: Build with Maven and deploy with AWS CLI
-      run: ./deploy/build-and-deploy.sh unused ${BRANCH_NAME}
+      run: ./deploy/build-and-deploy.sh unused ${{ env.BRANCH }}
       env:
         REPO_GITHUB_USERNAME: ${{ secrets.REPO_GITHUB_USERNAME }}
         REPO_GITHUB_TOKEN: ${{ secrets.REPO_GITHUB_TOKEN }}
@@ -64,7 +66,7 @@ jobs:
         branch: gh-pages # The branch the action should deploy to.
         folder: target/site/apidocs # The folder the action should deploy.
     - name: Report build status via Slack
-      uses: act10ns/slack@v1
+      uses: act10ns/slack@v2
       if: always()
       with:
         status: ${{ job.status }}

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -9,27 +9,28 @@ on:
       - 'docs/**'
 jobs:
   build:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up JDK 15
-      uses: actions/setup-java@v1
+      uses: actions/setup-java@v3
       with:
+        distribution: 'adopt'
         java-version: 15
     - name: Cache maven artifacts
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       env:
         cache-name: cache-maven-artifacts
       with:
         # npm cache files are stored in `~/.npm` on Linux/macOS
         path: ~/.m2
         key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }}
-    - name: Set up node 14.17.6
-      uses: actions/setup-node@v2.1.2
+    - name: Set up node 16
+      uses: actions/setup-node@v3
       with:
-        node-version: 14.17.6
+        node-version: 16
     - name: Cache node modules
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       env:
         cache-name: cache-node-modules
       with:
@@ -38,15 +39,16 @@ jobs:
         key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
     - name: Install Grunt globally
       run: npm install -g grunt-cli
-    - name: Get branch name
-      uses: nelonoel/branch-name@v1.0.1
+    - name: Extract branch name
+      shell: bash
+      run: echo "BRANCH=$(echo ${GITHUB_REF#refs/heads/})" >> $GITHUB_ENV
     - name: Build with Maven
-      run: ./deploy/build.sh unused ${BRANCH_NAME}
+      run: ./deploy/build.sh unused ${{ env.BRANCH }}
       env:
         REPO_GITHUB_USERNAME: ${{ secrets.REPO_GITHUB_USERNAME }}
         REPO_GITHUB_TOKEN: ${{ secrets.REPO_GITHUB_TOKEN }}
     - name: Report build status via Slack
-      uses: act10ns/slack@v1
+      uses: act10ns/slack@v2
       if: always()
       with:
         status: ${{ job.status }}