diff --git a/.gitattributes b/.gitattributes index c4b674eff..fcf9b296f 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,2 @@ -.java text=auto -.xml text=auto +*.java text=auto +*.xml text=auto diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index 5027705d7..0cc40d5c0 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -19,23 +19,23 @@ jobs: fail-fast: false matrix: java: [ '11', '17' ] - maven: [ '3.8.4'] + maven: [ '3.8.6' ] os: [ 'ubuntu-20.04' ] name: Build (Java ${{ matrix.java }}, ${{ matrix.os }}) runs-on: ${{ matrix.os }} steps: - name: Checkout if: github.head_ref == '' - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Checkout merge if: github.head_ref != '' - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: ref: refs/pull/${{github.event.pull_request.number}}/merge - name: Set up Cache - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: | ~/.m2/repository @@ -47,11 +47,11 @@ jobs: - name: Set up Java ${{ matrix.java }} uses: actions/setup-java@v2 with: - distribution: 'zulu' + distribution: 'temurin' java-version: ${{ matrix.java }} - name: Set up Maven ${{ matrix.maven }} - uses: stCarolas/setup-maven@v4.2 + uses: stCarolas/setup-maven@v4.4 with: maven-version: ${{ matrix.maven }} @@ -73,14 +73,14 @@ jobs: - name: Upload Build Log if: ${{ always() && ((steps.build.outcome == 'success') || (steps.build.outcome == 'failure')) }} - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: build-log-java-${{ matrix.java }}-${{ matrix.os }} path: build.log - name: Upload SAT Summary Report if: ${{ always() && ((steps.build.outcome == 'success') || (steps.build.outcome == 'failure')) }} - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: sat-summary-report path: target/summary_report.html diff --git a/.github/workflows/mainui.yml b/.github/workflows/mainui.yml index a3529519f..5ae666b47 100644 --- a/.github/workflows/mainui.yml +++ b/.github/workflows/mainui.yml @@ -18,14 +18,14 @@ jobs: # Steps represent a sequence of tasks that will be executed as part of the job steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v2 - - uses: actions/setup-node@v2 + - uses: actions/checkout@v3 + - uses: actions/setup-node@v3 with: node-version: '12.x' - name: Cache node modules id: cache - uses: actions/cache@v1 + uses: actions/cache@v3 with: path: node_modules # npm cache files are stored in `~/.npm` on Linux/macOS key: ${{ runner.os }}-node_modules-${{ hashFiles('**/package-lock.json') }} @@ -47,14 +47,14 @@ jobs: # Steps represent a sequence of tasks that will be executed as part of the job steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v2 - - uses: actions/setup-node@v2 + - uses: actions/checkout@v3 + - uses: actions/setup-node@v3 with: node-version: '12.x' - name: Cache node modules id: cache - uses: actions/cache@v1 + uses: actions/cache@v3 with: path: node_modules # npm cache files are stored in `~/.npm` on Linux/macOS key: ${{ runner.os }}-node_modules-${{ hashFiles('**/package-lock.json') }} @@ -70,7 +70,7 @@ jobs: - name: Build and generate report run: npm run webpack-analyzer-report-stats - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 with: name: report path: /home/runner/work/openhab-webui/openhab-webui/bundles/org.openhab.ui/web/report.html