Skip to content

Commit 856d5b3

Browse files
authored
Merge pull request #106 from datastax/feature/githubactions-integration
Feature/githubactions integration
2 parents f3e012a + fdea1de commit 856d5b3

File tree

7 files changed

+28
-3
lines changed

7 files changed

+28
-3
lines changed
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
name: Build and test jar with integration tests
2+
run-name: ${{ github.actor }} is testing out GitHub Actions 🚀
3+
on: [push]
4+
jobs:
5+
Explore-GitHub-Actions:
6+
runs-on: ubuntu-latest
7+
steps:
8+
- uses: actions/checkout@v3
9+
- name: Set up JDK 8
10+
uses: actions/setup-java@v3
11+
with:
12+
java-version: '8'
13+
distribution: 'temurin'
14+
cache: maven
15+
- name: Build with Maven
16+
run: mvn -B package --file pom.xml
17+
18+
- name: Test SIT with cdm
19+
working-directory: SIT
20+
run: |
21+
echo "Testing SIT with cdm"
22+
chmod o+rx ./environment.sh
23+
make -f Makefile

SIT/Makefile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11

2-
all: setup test_smoke env_teardown
2+
all: set_permissions setup test_smoke env_teardown
33

4+
set_permissions:
5+
chmod -R 777 ./*.sh
46
setup: build env_setup
57

68
reset: build env_reset
@@ -13,7 +15,7 @@ test_smoke: reset test_smoke_cmd
1315
test_smoke_cmd:
1416
./test.sh -p smoke
1517

16-
env_setup:
18+
env_setup:
1719
./environment.sh -m setup -j ../target/cassandra-data-migrator*.jar
1820
env_reset:
1921
./environment.sh -m reset -j ../target/cassandra-data-migrator*.jar

SIT/cdm.sh

100644100755
File mode changed.

SIT/common.sh

100644100755
File mode changed.

SIT/environment.sh

100644100755
File mode changed.

SIT/test.sh

100644100755
File mode changed.

src/main/java/datastax/astra/migrate/CopyJobSession.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public void getDataAndInsert(BigInteger min, BigInteger max) {
6868
if (readCnt % printStatsAfter == 0) {
6969
printCounts(false);
7070
}
71-
71+
// exclusion filter below
7272
if (filterData) {
7373
String col = (String) getData(new MigrateDataType(filterColType), filterColIndex, sourceRow);
7474
if (col.trim().equalsIgnoreCase(filterColValue)) {

0 commit comments

Comments
 (0)