Modify test file to force workflow to build and test DO NOT MERGE

IQSS · Nov 1, 2024 · 74fe482 · 74fe482
1 parent 25d0cac
commit 74fe482
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/.github/workflows/spi_release.yml b/.github/workflows/spi_release.yml
@@ -37,15 +37,15 @@ jobs:
         runs-on: ubuntu-latest
         if: github.event_name == 'pull_request' && needs.check-secrets.outputs.available == 'true'
         steps:
-            - uses: actions/checkout@v4
-            - uses: actions/setup-java@v4
+            - uses: actions/checkout@v3
+            - uses: actions/setup-java@v3
               with:
                   java-version: '17'
                   distribution: 'adopt'
                   server-id: ossrh
                   server-username: MAVEN_USERNAME
                   server-password: MAVEN_PASSWORD
-            - uses: actions/cache@v4
+            - uses: actions/cache@v2
               with:
                   path: ~/.m2
                   key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
@@ -63,20 +63,20 @@ jobs:
         runs-on: ubuntu-latest
         if: github.event_name == 'push' && needs.check-secrets.outputs.available == 'true'
         steps:
-            -   uses: actions/checkout@v4
-            -   uses: actions/setup-java@v4
+            -   uses: actions/checkout@v3
+            -   uses: actions/setup-java@v3
                 with:
                     java-version: '17'
                     distribution: 'adopt'
-            -   uses: actions/cache@v4
+            -   uses: actions/cache@v2
                 with:
                     path: ~/.m2
                     key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
                     restore-keys: ${{ runner.os }}-m2
 
             # Running setup-java again overwrites the settings.xml - IT'S MANDATORY TO DO THIS SECOND SETUP!!!
             -   name: Set up Maven Central Repository
-                uses: actions/setup-java@v4
+                uses: actions/setup-java@v3
                 with:
                     java-version: '17'
                     distribution: 'adopt'

diff --git a/conf/solr/update-fields.sh b/conf/solr/update-fields.sh
@@ -22,7 +22,6 @@ COPY_FIELDS=""
 TRIGGER_CHAIN=0
 ED_DELETE_FIELDS="'a+,'b-d"
 ED_DELETE_COPYFIELDS="'a+,'b-d"
-FAKEDONOTMERGE=0
 
 SOLR_SCHEMA_FIELD_BEGIN_MARK="SCHEMA-FIELDS::BEGIN"
 SOLR_SCHEMA_FIELD_END_MARK="SCHEMA-FIELDS::END"