Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#290: Add tests with many files #291

Merged
merged 37 commits into from
Dec 11, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
afe4aeb
Fix formatting of changelog
kaklakariada Dec 4, 2023
575228a
#290: Added tests for collectFiles with large input
kaklakariada Dec 4, 2023
6626726
Increment version
kaklakariada Dec 4, 2023
164e8b7
Update previous version for extension tests
kaklakariada Dec 4, 2023
cac52ff
Upgrade dependencies
kaklakariada Dec 4, 2023
86d374b
Update references
kaklakariada Dec 4, 2023
dcf97ef
Fix scala version
kaklakariada Dec 4, 2023
dd3f4ef
Remove unnecessary system property
kaklakariada Dec 4, 2023
d107204
Fix Fix CVE-2023-6378
kaklakariada Dec 4, 2023
3127aa3
Skip test if file does not exist
kaklakariada Dec 4, 2023
94dcb7b
Update changelog
kaklakariada Dec 4, 2023
eb712e6
Rename extension build job
kaklakariada Dec 4, 2023
1d47222
Revert dependency upgrades to fix duplicate finder
kaklakariada Dec 4, 2023
2073797
Enable remote logging
kaklakariada Dec 4, 2023
0037900
#288: Fix CVE-2023-6378
kaklakariada Dec 4, 2023
d9e6819
Fix references
kaklakariada Dec 4, 2023
9919312
merge
kaklakariada Dec 4, 2023
a53e864
Revert upgrades to fix duplicate finder
kaklakariada Dec 4, 2023
d9d567b
Skip linter for non-default build
kaklakariada Dec 4, 2023
9780186
merge
kaklakariada Dec 4, 2023
ad3ca18
Remove unused logging library
kaklakariada Dec 4, 2023
2563175
Improve logging
kaklakariada Dec 4, 2023
e3dc534
Improve log messages
kaklakariada Dec 5, 2023
f717900
Upgrade dependencies
kaklakariada Dec 6, 2023
09c764f
Fix formatting
kaklakariada Dec 6, 2023
44174ad
Rename scala linting job
kaklakariada Dec 6, 2023
e1d51f4
Remove separate linter job
kaklakariada Dec 6, 2023
5c03080
Remove test with real file names
kaklakariada Dec 6, 2023
e8dddb8
Update release dae
kaklakariada Dec 6, 2023
c372b36
Update release date
kaklakariada Dec 7, 2023
320547d
Remove unused imports
kaklakariada Dec 7, 2023
27f3946
Update release date
kaklakariada Dec 7, 2023
e6207dd
Upgrade extension dependencies
kaklakariada Dec 7, 2023
acbbf45
Adapt extension to new API
kaklakariada Dec 11, 2023
51dd7e6
Update vscode config to new version
kaklakariada Dec 11, 2023
d022e80
Update release date
kaklakariada Dec 11, 2023
d9a6643
Fix build
kaklakariada Dec 11, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci-build-extension.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
pull_request:

jobs:
build:
build-extension:
runs-on: ubuntu-22.04
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-build-next-java.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
with:
fetch-depth: 0
- name: Set up JDK 17
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: "temurin"
java-version: 17
Expand Down
33 changes: 23 additions & 10 deletions .github/workflows/ci-build.yml
Original file line number Diff line number Diff line change
@@ -1,22 +1,20 @@
name: CI Build

on:
push:
branches:
- main
pull_request:

jobs:
build:
name: Build with Exasol ${{ matrix.exasol_db_version }}
runs-on: ubuntu-20.04 # UDFs fail with "VM error: Internal error: VM crashed" on ubuntu-latest
matrix-build:
runs-on: ubuntu-20.04
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}-${{ matrix.exasol_db_version }}
cancel-in-progress: true
strategy:
fail-fast: false
matrix:
exasol_db_version: ["7.1.24", "8.23.1"]
exasol_db_version: ["8.23.1", "7.1.24"]
env:
DEFAULT_EXASOL_DB_VERSION: "8.23.1"
steps:
Expand All @@ -29,7 +27,7 @@ jobs:
with:
fetch-depth: 0
- name: Set up JDK 11 & 17
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: "temurin"
java-version: |
Expand All @@ -46,7 +44,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v4
with:
go-version: "1.20"
go-version: "1.21"
cache: false

- name: Cache Go modules
Expand All @@ -62,11 +60,20 @@ jobs:
- name: Enable testcontainer reuse
run: echo 'testcontainers.reuse.enable=true' > "$HOME/.testcontainers.properties"
- name: Run scalafix linting
run: mvn --batch-mode clean compile test-compile scalastyle:check scalafix:scalafix
if: ${{ matrix.exasol_db_version == env.DEFAULT_EXASOL_DB_VERSION }}
run: mvn --batch-mode clean compile test-compile scalastyle:check scalafix:scalafix spotless:check
- name: Build extension
run: |
mvn package -DskipTests
cd extension
npm ci
npm run build
npm run test
npm run lint
- name: Run tests and build with Maven
run: >
JAVA_HOME=$JAVA_HOME_11_X64
mvn --batch-mode clean verify
mvn --batch-mode verify
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
-DtrimStackTrace=false
-Dcom.exasol.dockerdb.image=${{ matrix.exasol_db_version }}
Expand All @@ -75,7 +82,7 @@ jobs:
# not forward it to the test. So we use this environment variable,
# see BaseIntegrationTest.scala.getExasolDockerImageVersion()
EXASOL_DB_VERSION: ${{ matrix.exasol_db_version }}
- name: Publish Test Report
- name: Publish Test Report for Exasol ${{ matrix.exasol_db_version }}
uses: scacap/action-surefire-report@v1
if: ${{ always() && github.event.pull_request.head.repo.full_name == github.repository && github.actor != 'dependabot[bot]' }}
with:
Expand All @@ -93,3 +100,9 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

build:
needs: matrix-build
runs-on: ubuntu-latest
steps:
- run: echo "Build successful"
25 changes: 0 additions & 25 deletions .github/workflows/linting.yml

This file was deleted.

4 changes: 2 additions & 2 deletions .github/workflows/release_droid_prepare_original_checksum.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@ jobs:
with:
fetch-depth: 0
- name: Set up JDK 11
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: "temurin"
java-version: 11
cache: "maven"
- name: Set up Go
uses: actions/setup-go@v3
with:
go-version: 1.19
go-version: "1.21"
- name: Enable testcontainer reuse
run: echo 'testcontainers.reuse.enable=true' > "$HOME/.testcontainers.properties"
- name: Run tests and build with Maven
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
with:
fetch-depth: 0
- name: Set up JDK 11
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: "temurin"
java-version: 11
Expand Down
6 changes: 6 additions & 0 deletions .project-keeper.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,9 @@ excludes:
- "E-PK-CORE-18: Outdated content: '.github/workflows/ci-build-next-java.yml'"
- "E-PK-CORE-18: Outdated content: '.github/workflows/release_droid_upload_github_release_assets.yml'"
- "E-PK-CORE-18: Outdated content: '.github/workflows/release_droid_prepare_original_checksum.yml'"
build:
runnerOs: ubuntu-20.04
freeDiskSpace: false
exasolDbVersions:
- "8.23.1"
- "7.1.24"
4 changes: 2 additions & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"editor.formatOnSave": true,
"editor.codeActionsOnSave": {
"source.organizeImports": true,
"source.generate.finalModifiers": true
"source.organizeImports": "explicit",
"source.generate.finalModifiers": "explicit"
},
"java.saveActions.organizeImports": true,
"java.sources.organizeImports.starThreshold": 3,
Expand Down
Loading