Skip to content

Commit c40e033

Browse files
simonredfernsimonredfern
committed
Merge remote-tracking branch 'origin/develop' into develop
Fixed following # Conflicts: # .github/workflows/build_container_develop_branch.yml # .github/workflows/build_container_non_develop_branch.yml # .github/workflows/build_pull_request.yml
2 parents f5dd612 + 3a264ed commit c40e033

5 files changed

Lines changed: 0 additions & 394 deletions

File tree

‎.github/workflows/auto_update_base_image.yml‎

Lines changed: 0 additions & 35 deletions
This file was deleted.

‎.github/workflows/build_container_develop_branch.yml‎

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -124,33 +124,3 @@ jobs:
124124
with:
125125
name: ${{ github.sha }}
126126
path: push/
127-
128-
- name: Build the Docker image
129-
run: |
130-
echo "${{ secrets.DOCKER_HUB_TOKEN }}" | docker login -u "${{ secrets.DOCKER_HUB_USERNAME }}" --password-stdin docker.io
131-
docker build . --file .github/Dockerfile_PreBuild --tag docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }}:$GITHUB_SHA --tag docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }}:latest --tag docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }}:develop
132-
docker build . --file .github/Dockerfile_PreBuild_OC --tag docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }}:$GITHUB_SHA-OC --tag docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }}:latest-OC --tag docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }}:develop-OC --tag docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }}:${GITHUB_REF##*/}-OC
133-
docker push docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }} --all-tags
134-
echo docker done
135-
136-
- uses: sigstore/cosign-installer@4d14d7f17e7112af04ea6108fbb4bfc714c00390
137-
138-
- name: Write signing key to disk (only needed for `cosign sign --key`)
139-
run: echo "${{ secrets.COSIGN_PRIVATE_KEY }}" > cosign.key
140-
141-
- name: Sign container image
142-
run: |
143-
cosign sign -y --key cosign.key \
144-
docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }}:develop
145-
cosign sign -y --key cosign.key \
146-
docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }}:latest
147-
cosign sign -y --key cosign.key \
148-
docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }}:$GITHUB_SHA
149-
cosign sign -y --key cosign.key \
150-
docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }}:develop-OC
151-
cosign sign -y --key cosign.key \
152-
docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }}:latest-OC
153-
env:
154-
COSIGN_PASSWORD: "${{secrets.COSIGN_PASSWORD}}"
155-
156-

‎.github/workflows/build_container_non_develop_branch.yml‎

Lines changed: 0 additions & 151 deletions
Original file line numberDiff line numberDiff line change
@@ -1,151 +0,0 @@
1-
name: Build and publish container non develop
2-
3-
on:
4-
push:
5-
branches:
6-
- '**'
7-
- '!develop'
8-
9-
env:
10-
DOCKER_HUB_ORGANIZATION: ${{ vars.DOCKER_HUB_ORGANIZATION }}
11-
DOCKER_HUB_REPOSITORY: obp-api
12-
13-
jobs:
14-
build:
15-
runs-on: ubuntu-latest
16-
services:
17-
# Label used to access the service container
18-
redis:
19-
# Docker Hub image
20-
image: redis
21-
ports:
22-
# Opens tcp port 6379 on the host and service container
23-
- 6379:6379
24-
# Set health checks to wait until redis has started
25-
options: >-
26-
--health-cmd "redis-cli ping"
27-
--health-interval 10s
28-
--health-timeout 5s
29-
--health-retries 5
30-
steps:
31-
- uses: actions/checkout@v4
32-
- name: Extract branch name
33-
shell: bash
34-
run: echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}"
35-
- name: Set up JDK 11
36-
uses: actions/setup-java@v4
37-
with:
38-
java-version: '11'
39-
distribution: 'adopt'
40-
cache: maven
41-
- name: Build with Maven
42-
run: |
43-
set -o pipefail
44-
cp obp-api/src/main/resources/props/sample.props.template obp-api/src/main/resources/props/production.default.props
45-
echo connector=star > obp-api/src/main/resources/props/test.default.props
46-
echo starConnector_supported_types=mapped,internal >> obp-api/src/main/resources/props/test.default.props
47-
echo hostname=http://localhost:8016 >> obp-api/src/main/resources/props/test.default.props
48-
echo tests.port=8016 >> obp-api/src/main/resources/props/test.default.props
49-
echo End of minimum settings >> obp-api/src/main/resources/props/test.default.props
50-
echo payments_enabled=false >> obp-api/src/main/resources/props/test.default.props
51-
echo importer_secret=change_me >> obp-api/src/main/resources/props/test.default.props
52-
echo messageQueue.updateBankAccountsTransaction=false >> obp-api/src/main/resources/props/test.default.props
53-
echo messageQueue.createBankAccounts=false >> obp-api/src/main/resources/props/test.default.props
54-
echo allow_sandbox_account_creation=true >> obp-api/src/main/resources/props/test.default.props
55-
echo allow_sandbox_data_import=true >> obp-api/src/main/resources/props/test.default.props
56-
echo sandbox_data_import_secret=change_me >> obp-api/src/main/resources/props/test.default.props
57-
echo allow_account_deletion=true >> obp-api/src/main/resources/props/test.default.props
58-
echo allowed_internal_redirect_urls = /,/oauth/authorize >> obp-api/src/main/resources/props/test.default.props
59-
echo transactionRequests_enabled=true >> obp-api/src/main/resources/props/test.default.props
60-
echo transactionRequests_supported_types=SEPA,SANDBOX_TAN,FREE_FORM,COUNTERPARTY,ACCOUNT,SIMPLE >> obp-api/src/main/resources/props/test.default.props
61-
echo SIMPLE_OTP_INSTRUCTION_TRANSPORT=dummy >> obp-api/src/main/resources/props/test.default.props
62-
echo openredirects.hostname.whitlelist=http://127.0.0.1,http://localhost >> obp-api/src/main/resources/props/test.default.props
63-
echo remotedata.secret = foobarbaz >> obp-api/src/main/resources/props/test.default.props
64-
echo allow_public_views=true >> obp-api/src/main/resources/props/test.default.props
65-
66-
echo SIMPLE_OTP_INSTRUCTION_TRANSPORT=dummy >> obp-api/src/main/resources/props/test.default.props
67-
echo ACCOUNT_OTP_INSTRUCTION_TRANSPORT=dummy >> obp-api/src/main/resources/props/test.default.props
68-
echo SEPA_OTP_INSTRUCTION_TRANSPORT=dummy >> obp-api/src/main/resources/props/test.default.props
69-
echo FREE_FORM_OTP_INSTRUCTION_TRANSPORT=dummy >> obp-api/src/main/resources/props/test.default.props
70-
echo COUNTERPARTY_OTP_INSTRUCTION_TRANSPORT=dummy >> obp-api/src/main/resources/props/test.default.props
71-
echo SEPA_CREDIT_TRANSFERS_OTP_INSTRUCTION_TRANSPORT=dummy >> obp-api/src/main/resources/props/test.default.props
72-
73-
echo allow_oauth2_login=true >> obp-api/src/main/resources/props/test.default.props
74-
echo oauth2.jwk_set.url=https://www.googleapis.com/oauth2/v3/certs >> obp-api/src/main/resources/props/test.default.props
75-
76-
echo ResetPasswordUrlEnabled=true >> obp-api/src/main/resources/props/test.default.props
77-
78-
echo consents.allowed=true >> obp-api/src/main/resources/props/test.default.props
79-
MAVEN_OPTS="-Xmx3G -Xss2m" mvn clean package -Pprod 2>&1 | tee maven-build.log
80-
81-
- name: Report failing tests (if any)
82-
if: always()
83-
run: |
84-
echo "Checking build log for failing tests via grep..."
85-
if [ ! -f maven-build.log ]; then
86-
echo "No maven-build.log found; skipping failure scan."
87-
exit 0
88-
fi
89-
if grep -n "\*\*\* FAILED \*\*\*" maven-build.log; then
90-
echo "Failing tests detected above."
91-
exit 1
92-
else
93-
echo "No failing tests detected in maven-build.log."
94-
fi
95-
96-
- name: Upload Maven build log
97-
if: always()
98-
uses: actions/upload-artifact@v4
99-
with:
100-
name: maven-build-log
101-
if-no-files-found: ignore
102-
path: |
103-
maven-build.log
104-
105-
- name: Upload test reports
106-
if: always()
107-
uses: actions/upload-artifact@v4
108-
with:
109-
name: test-reports
110-
if-no-files-found: ignore
111-
path: |
112-
obp-api/target/surefire-reports/**
113-
obp-commons/target/surefire-reports/**
114-
**/target/scalatest-reports/**
115-
**/target/site/surefire-report.html
116-
**/target/site/surefire-report/*
117-
118-
- name: Save .war artifact
119-
run: |
120-
mkdir -p ./push
121-
cp obp-api/target/obp-api-1.*.war ./push/
122-
- uses: actions/upload-artifact@v4
123-
with:
124-
name: ${{ github.sha }}
125-
path: push/
126-
127-
- name: Build the Docker image
128-
run: |
129-
echo "${{ secrets.DOCKER_HUB_TOKEN }}" | docker login -u "${{ secrets.DOCKER_HUB_USERNAME }}" --password-stdin docker.io
130-
docker build . --file .github/Dockerfile_PreBuild --tag docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }}:$GITHUB_SHA --tag docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }}:${GITHUB_REF##*/}
131-
docker build . --file .github/Dockerfile_PreBuild_OC --tag docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }}:$GITHUB_SHA-OC --tag docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }}:${GITHUB_REF##*/}-OC
132-
docker push docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }} --all-tags
133-
echo docker done
134-
135-
- uses: sigstore/cosign-installer@4d14d7f17e7112af04ea6108fbb4bfc714c00390
136-
137-
- name: Write signing key to disk (only needed for `cosign sign --key`)
138-
run: echo "${{ secrets.COSIGN_PRIVATE_KEY }}" > cosign.key
139-
140-
- name: Sign container image
141-
run: |
142-
cosign sign -y --key cosign.key \
143-
docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }}:${GITHUB_REF##*/}
144-
cosign sign -y --key cosign.key \
145-
docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }}:${GITHUB_REF##*/}-OC
146-
cosign sign -y --key cosign.key \
147-
docker.io/${{ env.DOCKER_HUB_ORGANIZATION }}/${{ env.DOCKER_HUB_REPOSITORY }}:$GITHUB_SHA
148-
env:
149-
COSIGN_PASSWORD: "${{secrets.COSIGN_PASSWORD}}"
150-
151-

‎.github/workflows/build_pull_request.yml‎

Lines changed: 0 additions & 124 deletions
Original file line numberDiff line numberDiff line change
@@ -1,124 +0,0 @@
1-
name: Build on Pull Request
2-
3-
on:
4-
pull_request:
5-
branches:
6-
- '**'
7-
env:
8-
## Sets environment variable
9-
DOCKER_HUB_ORGANIZATION: ${{ vars.DOCKER_HUB_ORGANIZATION }}
10-
11-
12-
jobs:
13-
build:
14-
runs-on: ubuntu-latest
15-
services:
16-
# Label used to access the service container
17-
redis:
18-
# Docker Hub image
19-
image: redis
20-
ports:
21-
# Opens tcp port 6379 on the host and service container
22-
- 6379:6379
23-
# Set health checks to wait until redis has started
24-
options: >-
25-
--health-cmd "redis-cli ping"
26-
--health-interval 10s
27-
--health-timeout 5s
28-
--health-retries 5
29-
steps:
30-
- uses: actions/checkout@v4
31-
- name: Set up JDK 11
32-
uses: actions/setup-java@v4
33-
with:
34-
java-version: '11'
35-
distribution: 'adopt'
36-
cache: maven
37-
- name: Build with Maven
38-
run: |
39-
set -o pipefail
40-
cp obp-api/src/main/resources/props/sample.props.template obp-api/src/main/resources/props/production.default.props
41-
echo connector=star > obp-api/src/main/resources/props/test.default.props
42-
echo starConnector_supported_types=mapped,internal >> obp-api/src/main/resources/props/test.default.props
43-
echo hostname=http://localhost:8016 >> obp-api/src/main/resources/props/test.default.props
44-
echo tests.port=8016 >> obp-api/src/main/resources/props/test.default.props
45-
echo End of minimum settings >> obp-api/src/main/resources/props/test.default.props
46-
echo payments_enabled=false >> obp-api/src/main/resources/props/test.default.props
47-
echo importer_secret=change_me >> obp-api/src/main/resources/props/test.default.props
48-
echo messageQueue.updateBankAccountsTransaction=false >> obp-api/src/main/resources/props/test.default.props
49-
echo messageQueue.createBankAccounts=false >> obp-api/src/main/resources/props/test.default.props
50-
echo allow_sandbox_account_creation=true >> obp-api/src/main/resources/props/test.default.props
51-
echo allow_sandbox_data_import=true >> obp-api/src/main/resources/props/test.default.props
52-
echo sandbox_data_import_secret=change_me >> obp-api/src/main/resources/props/test.default.props
53-
echo allow_account_deletion=true >> obp-api/src/main/resources/props/test.default.props
54-
echo allowed_internal_redirect_urls = /,/oauth/authorize >> obp-api/src/main/resources/props/test.default.props
55-
echo transactionRequests_enabled=true >> obp-api/src/main/resources/props/test.default.props
56-
echo transactionRequests_supported_types=SEPA,SANDBOX_TAN,FREE_FORM,COUNTERPARTY,ACCOUNT,SIMPLE >> obp-api/src/main/resources/props/test.default.props
57-
echo SIMPLE_OTP_INSTRUCTION_TRANSPORT=dummy >> obp-api/src/main/resources/props/test.default.props
58-
echo openredirects.hostname.whitlelist=http://127.0.0.1,http://localhost >> obp-api/src/main/resources/props/test.default.props
59-
echo remotedata.secret = foobarbaz >> obp-api/src/main/resources/props/test.default.props
60-
echo allow_public_views=true >> obp-api/src/main/resources/props/test.default.props
61-
62-
echo SIMPLE_OTP_INSTRUCTION_TRANSPORT=dummy >> obp-api/src/main/resources/props/test.default.props
63-
echo ACCOUNT_OTP_INSTRUCTION_TRANSPORT=dummy >> obp-api/src/main/resources/props/test.default.props
64-
echo SEPA_OTP_INSTRUCTION_TRANSPORT=dummy >> obp-api/src/main/resources/props/test.default.props
65-
echo FREE_FORM_OTP_INSTRUCTION_TRANSPORT=dummy >> obp-api/src/main/resources/props/test.default.props
66-
echo COUNTERPARTY_OTP_INSTRUCTION_TRANSPORT=dummy >> obp-api/src/main/resources/props/test.default.props
67-
echo SEPA_CREDIT_TRANSFERS_OTP_INSTRUCTION_TRANSPORT=dummy >> obp-api/src/main/resources/props/test.default.props
68-
69-
echo allow_oauth2_login=true >> obp-api/src/main/resources/props/test.default.props
70-
echo oauth2.jwk_set.url=https://www.googleapis.com/oauth2/v3/certs >> obp-api/src/main/resources/props/test.default.props
71-
72-
echo ResetPasswordUrlEnabled=true >> obp-api/src/main/resources/props/test.default.props
73-
74-
echo consents.allowed=true >> obp-api/src/main/resources/props/test.default.props
75-
MAVEN_OPTS="-Xmx3G -Xss2m" mvn clean package -Pprod 2>&1 | tee maven-build.log
76-
77-
- name: Report failing tests (if any)
78-
if: always()
79-
run: |
80-
echo "Checking build log for failing tests via grep..."
81-
if [ ! -f maven-build.log ]; then
82-
echo "No maven-build.log found; skipping failure scan."
83-
exit 0
84-
fi
85-
if grep -n "\*\*\* FAILED \*\*\*" maven-build.log; then
86-
echo "Failing tests detected above."
87-
exit 1
88-
else
89-
echo "No failing tests detected in maven-build.log."
90-
fi
91-
92-
- name: Upload Maven build log
93-
if: always()
94-
uses: actions/upload-artifact@v4
95-
with:
96-
name: maven-build-log
97-
if-no-files-found: ignore
98-
path: |
99-
maven-build.log
100-
101-
- name: Upload test reports
102-
if: always()
103-
uses: actions/upload-artifact@v4
104-
with:
105-
name: test-reports
106-
if-no-files-found: ignore
107-
path: |
108-
obp-api/target/surefire-reports/**
109-
obp-commons/target/surefire-reports/**
110-
**/target/scalatest-reports/**
111-
**/target/site/surefire-report.html
112-
**/target/site/surefire-report/*
113-
114-
- name: Save .war artifact
115-
run: |
116-
mkdir -p ./pull
117-
cp obp-api/target/obp-api-1.*.war ./pull/
118-
- uses: actions/upload-artifact@v4
119-
with:
120-
name: ${{ github.sha }}
121-
path: pull/
122-
123-
124-

0 commit comments

Comments
 (0)