You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2022/04/11 04:17:28 UTC
[isis] branch master updated: ISIS-2445: reinstate build triggers on push
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new 3eaa5ccb65 ISIS-2445: reinstate build triggers on push
3eaa5ccb65 is described below
commit 3eaa5ccb656a17e3c75d7c556803fe844fd1977c
Author: Andi Huber <ah...@apache.org>
AuthorDate: Mon Apr 11 06:17:23 2022 +0200
ISIS-2445: reinstate build triggers on push
---
.github/workflows/ci-build-artifacts-no-push-maven.yml | 2 +-
.github/workflows/ci-build-site-no-push.yml | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/.github/workflows/ci-build-artifacts-no-push-maven.yml b/.github/workflows/ci-build-artifacts-no-push-maven.yml
index 535e6d8c10..961f72ab43 100644
--- a/.github/workflows/ci-build-artifacts-no-push-maven.yml
+++ b/.github/workflows/ci-build-artifacts-no-push-maven.yml
@@ -3,7 +3,7 @@ name: Build, Test (JDK 18)
on:
push:
branches:
- - masterNOOP
+ - master
pull_request:
branches:
- master
diff --git a/.github/workflows/ci-build-site-no-push.yml b/.github/workflows/ci-build-site-no-push.yml
index 3747072c7f..93da71819f 100644
--- a/.github/workflows/ci-build-site-no-push.yml
+++ b/.github/workflows/ci-build-site-no-push.yml
@@ -3,7 +3,7 @@ name: Build Site (w/ Antora)
on:
push:
branches:
- - masterNOOP
+ - master
pull_request:
branches:
- master
@@ -17,7 +17,7 @@ jobs:
runs-on: ubuntu-latest
env:
# to be shared among all steps of this job
- BASELINE: 2.0.0-M6
+ BASELINE: 2.0.0-M7
PROJECT_ROOT_PATH: ${{ github.workspace }}
CI_SCRIPTS_PATH: ${{ github.workspace }}/scripts/ci
ANTORA_PLAYBOOKS_PATH: ${{ github.workspace }}/antora/playbooks
@@ -32,11 +32,11 @@ jobs:
steps:
- uses: actions/checkout@v3
- - name: Set up JDK 17
+ - name: Set up JDK 18
uses: actions/setup-java@v3
with:
distribution: 'zulu'
- java-version: 17
+ java-version: 18
- name: Setup Script Environment
shell: bash