Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into main
Browse files Browse the repository at this point in the history
# Conflicts:
#	pom.xml
  • Loading branch information
qytera-development committed May 15, 2024
2 parents 03c7fce + 20d3f60 commit e28b8b9
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 12 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/CreateAWSEnv.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ jobs:
timeout-minutes: 10

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Get current time
uses: gerred/actions/current-time@master
uses: snooze-au/current-time-action@master
id: current-time
- name: Setup Terraform
uses: hashicorp/setup-terraform@v2
uses: hashicorp/setup-terraform@v3
with:
terraform_version: 1.1.8
- name: Create AWS credentials files
Expand All @@ -31,7 +31,7 @@ jobs:
- name: Generate deployment package
run: zip -r deploy.zip . docker-compose.yml
- name: Deploy to EB
uses: einaregilsson/beanstalk-deploy@v20
uses: einaregilsson/beanstalk-deploy@v22
with:
aws_access_key: ${{ secrets.AWS_ACCESS_KEY_ID }}
aws_secret_key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/DestroyAWSEnv.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ jobs:
timeout-minutes: 10

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Setup Terraform
uses: hashicorp/setup-terraform@v2
uses: hashicorp/setup-terraform@v3
with:
terraform_version: 1.1.8
- name: Create AWS credentials files
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/SuiteCRMTests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,15 @@ jobs:
ALLOW_EMPTY_PASSWORD: yes

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Sleep for 45 seconds
run: sleep 45s
shell: bash
- name: Ping application
run: curl http://localhost:8080
- name: Ping application
run: wget http://localhost:8080
- uses: actions/setup-java@v3
- uses: actions/setup-java@v4
with:
distribution: 'zulu' # See 'Supported distributions' for available options
java-version: '19'
Expand Down
8 changes: 4 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,13 @@
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.26</version>
<version>1.18.32</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<version>7.8.0</version>
<version>7.10.2</version>
<scope>test</scope>
</dependency>

Expand All @@ -71,14 +71,14 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.1.2</version>
<version>3.2.5</version>
</plugin>

<!-- Plugin to build a JAR file -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.1.0</version>
<version>3.4.1</version>
<configuration>
<archive>
<manifest>
Expand Down

0 comments on commit e28b8b9

Please sign in to comment.