Skip to content

Commit 87f1542

Browse files
committed
Merge remote-tracking branch 'origin/main'
# Conflicts: # .github/workflows/cdm-integrationtest.yml
2 parents 0af680d + 3867931 commit 87f1542

File tree

3 files changed

+8
-10
lines changed

3 files changed

+8
-10
lines changed
Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: Build and test jar with integration tests
2-
32
on: [push]
43
jobs:
4+
CDM-Integration-Test:
55
runs-on: ubuntu-latest
66
steps:
77
- uses: actions/checkout@v3
@@ -11,12 +11,8 @@ jobs:
1111
java-version: '8'
1212
distribution: 'temurin'
1313
cache: maven
14-
- name: Build with Maven
15-
run: mvn -B package --file pom.xml
16-
1714
- name: Test SIT with cdm
1815
working-directory: SIT
1916
run: |
2017
echo "Testing SIT with cdm"
21-
chmod o+rx ./environment.sh
22-
make -f Makefile
18+
make -f Makefile

SIT/Makefile

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

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

4-
set_permissions:
5-
chmod -R 777 ./*.sh
64
setup: build env_setup
75

86
reset: build env_reset
@@ -16,6 +14,7 @@ test_smoke_cmd:
1614
./test.sh -p smoke
1715

1816
env_setup:
17+
chmod -R 777 ./*.sh
1918
./environment.sh -m setup -j ../target/cassandra-data-migrator*.jar
2019
env_reset:
2120
./environment.sh -m reset -j ../target/cassandra-data-migrator*.jar

pom.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<properties>
1010
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
11-
<revision>3.4.0</revision>
11+
<revision>4.0.0-SNAPSHOT</revision>
1212
<scala.version>2.12.17</scala.version>
1313
<scala.main.version>2.12</scala.main.version>
1414
<spark.version>3.3.1</spark.version>
@@ -23,6 +23,9 @@
2323
<id>github</id>
2424
<name>GitHub Packages</name>
2525
<url>https://maven.pkg.github.com/datastax/cassandra-data-migrator</url>
26+
<snapshots>
27+
<enabled>false</enabled>
28+
</snapshots>
2629
</repository>
2730
</distributionManagement>
2831

0 commit comments

Comments
 (0)