diff --git a/.github/workflows/small-test.yml b/.github/workflows/small-test.yml index 3300f54ee5..febdff45eb 100644 --- a/.github/workflows/small-test.yml +++ b/.github/workflows/small-test.yml @@ -10,19 +10,19 @@ jobs: run: shell: bash -l {0} steps: - - uses: actions/setup-java@v3 + - uses: actions/setup-java@v4 with: distribution: 'zulu' java-version: 8 - run: echo "JAVA8_HOME=$JAVA_HOME" >> $GITHUB_ENV - run: java -version - - uses: actions/setup-java@v3 + - uses: actions/setup-java@v4 with: distribution: 'zulu' java-version: 11 - run: echo "JAVA11_HOME=$JAVA_HOME" >> $GITHUB_ENV - run: java -version - - uses: actions/setup-java@v3 + - uses: actions/setup-java@v4 with: distribution: 'zulu' java-version: 17 diff --git a/.github/workflows/test-replay.yml b/.github/workflows/test-replay.yml index be66969ed3..23a2716027 100644 --- a/.github/workflows/test-replay.yml +++ b/.github/workflows/test-replay.yml @@ -10,19 +10,19 @@ jobs: run: shell: bash -l {0} steps: - - uses: actions/setup-java@v3 + - uses: actions/setup-java@v4 with: distribution: 'zulu' java-version: 8 - run: echo "JAVA8_HOME=$JAVA_HOME" >> $GITHUB_ENV - run: java -version - - uses: actions/setup-java@v3 + - uses: actions/setup-java@v4 with: distribution: 'zulu' java-version: 11 - run: echo "JAVA11_HOME=$JAVA_HOME" >> $GITHUB_ENV - run: java -version - - uses: actions/setup-java@v3 + - uses: actions/setup-java@v4 with: distribution: 'zulu' java-version: 17 diff --git a/src/python/replay_merge.py b/src/python/replay_merge.py index 1a0d6bab44..2b0b4d7cd5 100755 --- a/src/python/replay_merge.py +++ b/src/python/replay_merge.py @@ -239,12 +239,6 @@ def merge_replay( + os.getcwd() + "/src/scripts/merge_tools/merging/src/main/sh/" ) - parser.add_argument( - "-create_artifacts", - help="Create artifacts", - action="store_true", - ) - args = parser.parse_args() df = pd.read_csv(args.merges_csv, index_col="idx")