Skip to content

Commit 7fc5e31

Browse files
committed
Attempt repair of workflow yaml's
1 parent 5871cd5 commit 7fc5e31

2 files changed

Lines changed: 10 additions & 13 deletions

File tree

.github/workflows/k8s-deploy-latest.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
name: k8s-deploy-latest
77

88
env:
9-
K8S_NAMESPACE: 'orchid-dev'
10-
K8S_DEPLOYMENT: 'mod-sender-dev'
9+
K8S_NAMESPACE: 'folio-dev-new'
10+
K8S_DEPLOYMENT: 'mod-circulation-dev'
1111

1212
on:
1313
workflow_dispatch
@@ -20,7 +20,7 @@ jobs:
2020
- name: Deploy latest to K8s
2121
uses: actions-hub/kubectl@v1.34.1
2222
env:
23-
KUBE_CONFIG: ${{ secrets.ORCHID_DEV_SA_KUBECONFIG }}
23+
KUBE_CONFIG: ${{ secrets.FOLIO_DEV_NEW_SA_KUBECONFIG }}
2424
with:
2525
args:
2626
-n ${{ env.K8S_NAMESPACE }} rollout restart deployment ${{ env.K8S_DEPLOYMENT }}

.github/workflows/mvn-dev-build-deploy.yml

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ on:
88

99
env:
1010
PUBLISH_BRANCH: 'deployment'
11-
OKAPI_URL: 'https://orchid-dev-okapi.folio-dev.indexdata.com'
12-
OKAPI_SECRET_USER: "${{ secrets.ORCHID_DEV_OKAPI_USER }}"
13-
OKAPI_SECRET_PASSWORD: "${{ secrets.ORCHID_DEV_OKAPI_PASSWORD }}"
11+
OKAPI_URL: 'https://folio-dev-new-okapi.folio-dev.indexdata.com'
12+
OKAPI_SECRET_USER: "${{ secrets.FOLIO_DEV_NEW_OKAPI_USER }}"
13+
OKAPI_SECRET_PASSWORD: "${{ secrets.FOLIO_DEV_NEW_OKAPI_PASSWORD }}"
1414
OK_SESSION: 'session1'
1515

1616
jobs:
@@ -22,10 +22,10 @@ jobs:
2222
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
2323
submodules: recursive
2424

25-
- name: Set up JDK 17
25+
- name: Set up JDK 21
2626
uses: actions/setup-java@v4
2727
with:
28-
java-version: 17
28+
java-version: 21
2929
distribution: 'temurin' # Alternative distribution options are available.
3030

3131
- name: Prepare okclient
@@ -66,14 +66,11 @@ jobs:
6666
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
6767
restore-keys: ${{ runner.os }}-m2
6868

69-
- name: Maven build
70-
run: mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent install org.jacoco:jacoco-maven-plugin:report
71-
72-
- name: SQ analyze
69+
- name: Build and SQ analyze
7370
env:
7471
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
7572
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
76-
run: mvn -B org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.host.url=https://sonarcloud.io -Dsonar.organization=indexdata -Dsonar.projectKey=indexdata_${{ github.event.repository.name }} -Dsonar.coverage.jacoco.xmlReportPaths=target/site/jacoco/jacoco.xml
73+
run: mvn -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.host.url=https://sonarcloud.io -Dsonar.organization=indexdata -Dsonar.projectKey=indexdata_${{ github.event.repository.name }}
7774

7875
- name: Update ModuleDescriptor Id
7976
run: |

0 commit comments

Comments
 (0)