Skip to content

Commit

Permalink
Adjusting ghactions
Browse files Browse the repository at this point in the history
  • Loading branch information
bbpennel committed Aug 29, 2024
1 parent 4239fde commit 714c275
Show file tree
Hide file tree
Showing 2 changed files with 61 additions and 55 deletions.
115 changes: 60 additions & 55 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,10 @@ jobs:
# Need to copy the config is outside of the source path, otherwise it produces permission conflicts
- name: Copy Solr Config into container
run: sudo cp -r ${{ github.workspace }}/etc/solr-config/* /tmp/solr-config/
run: sudo cp -r ${{ github.workspace }}/etc/solr-config /tmp/solr-config/config

- name: Change permissions of /tmp/solr-config
run: sudo chmod -R 2777 /tmp/solr-config

- name: Wait for Solr to start
run: |
Expand All @@ -65,57 +68,59 @@ jobs:
done
- name: Create Solr Core
run: curl "http://localhost:48983/solr/admin/cores?action=CREATE&name=access&instanceDir=/solr_config&config=solrconfig.xml&schema=schema.xml"


- name: Checkout submodules
run: git submodule update --init --recursive

- name: Set up JDK 11
uses: actions/setup-java@v1
with:
java-version: 11

- name: Cache Maven packages
uses: actions/cache@v2
with:
path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-m2
- name: Build with Maven
run: mvn -B -U -pl '!integration' clean install -DskipTests
- name: Set up nodejs
uses: actions/setup-node@v2
with:
node-version: '16'
- name: Cache npm modules
uses: actions/cache@v2
with:
path: ~/.npm
key: v1-npm-deps-${{ hashFiles('**/package-lock.json') }}
restore-keys: v1-npm-deps-

- run: npm --prefix static/js/vue-cdr-access install
- run: npm --prefix static/js/admin/vue-permissions-editor install

- run: npm install -g [email protected]
- run: npm --prefix static/js/vue-cdr-access run test
- run: npm --prefix static/js/admin/vue-permissions-editor run test

- name: Report to CodeClimate
uses: paambaati/[email protected]
env:
CC_TEST_REPORTER_ID: ${{secrets.CC_TEST_REPORTER_ID}}
JACOCO_SOURCE_PATH: "${{github.workspace}}/auth-api/src/main/java ${{github.workspace}}/auth-fcrepo/src/main/java ${{github.workspace}}/common-utils/src/main/java ${{github.workspace}}/deposit-app/src/main/java ${{github.workspace}}/deposit-utils/src/main/java ${{github.workspace}}/fcrepo-utils/src/main/java ${{github.workspace}}/indexing-solr/src/main/java ${{github.workspace}}/integration/src/main/java ${{github.workspace}}/model-api/src/main/java ${{github.workspace}}/model-fcrepo/src/main/java ${{github.workspace}}/operations/src/main/java ${{github.workspace}}/operations-jms/src/main/java ${{github.workspace}}/persistence/src/main/java ${{github.workspace}}/persistence-api/src/main/java ${{github.workspace}}/search-api/src/main/java ${{github.workspace}}/search-solr/src/main/java ${{github.workspace}}/services-camel-app/src/main/java ${{github.workspace}}/web-access-app/src/main/java ${{github.workspace}}/web-access-war/src/main/java ${{github.workspace}}/web-admin-app/src/main/java ${{github.workspace}}/web-common/src/main/java ${{github.workspace}}/web-services-app/src/main/java ${{github.workspace}}/web-sword/src/main/java ${{github.workspace}}/clamav-java/src/main/java"
with:
coverageCommand: mvn -pl !clamav-java verify
coverageLocations: |
${{github.workspace}}/**/target/site/jacoco/jacoco.xml:jacoco
${{github.workspace}}/**/target/site/jacoco-it/jacoco.xml:jacoco
${{github.workspace}}/static/js/vue-cdr-access/coverage/lcov.info:lcov
${{github.workspace}}/static/js/admin/vue-permissions-editor/coverage/lcov.info:lcov
- name: View fedora service logs
if: always()
run: |
docker logs ${{ env.CONTAINER_ID }}
run: curl "http://localhost:48983/solr/admin/cores?action=CREATE&name=access&instanceDir=/solr_config/config&config=solrconfig.xml&schema=schema.xml"

- name: Probe Solr core
run: curl -s "http://localhost:48983/solr/access/select?q=*"
#
# - name: Checkout submodules
# run: git submodule update --init --recursive
#
# - name: Set up JDK 11
# uses: actions/setup-java@v1
# with:
# java-version: 11
#
# - name: Cache Maven packages
# uses: actions/cache@v2
# with:
# path: ~/.m2
# key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
# restore-keys: ${{ runner.os }}-m2
# - name: Build with Maven
# run: mvn -B -U -pl '!integration' clean install -DskipTests
# - name: Set up nodejs
# uses: actions/setup-node@v2
# with:
# node-version: '16'
# - name: Cache npm modules
# uses: actions/cache@v2
# with:
# path: ~/.npm
# key: v1-npm-deps-${{ hashFiles('**/package-lock.json') }}
# restore-keys: v1-npm-deps-

# - run: npm --prefix static/js/vue-cdr-access install
# - run: npm --prefix static/js/admin/vue-permissions-editor install
#
# - run: npm install -g [email protected]
# - run: npm --prefix static/js/vue-cdr-access run test
# - run: npm --prefix static/js/admin/vue-permissions-editor run test

# - name: Report to CodeClimate
# uses: paambaati/[email protected]
# env:
# CC_TEST_REPORTER_ID: ${{secrets.CC_TEST_REPORTER_ID}}
# JACOCO_SOURCE_PATH: "${{github.workspace}}/auth-api/src/main/java ${{github.workspace}}/auth-fcrepo/src/main/java ${{github.workspace}}/common-utils/src/main/java ${{github.workspace}}/deposit-app/src/main/java ${{github.workspace}}/deposit-utils/src/main/java ${{github.workspace}}/fcrepo-utils/src/main/java ${{github.workspace}}/indexing-solr/src/main/java ${{github.workspace}}/integration/src/main/java ${{github.workspace}}/model-api/src/main/java ${{github.workspace}}/model-fcrepo/src/main/java ${{github.workspace}}/operations/src/main/java ${{github.workspace}}/operations-jms/src/main/java ${{github.workspace}}/persistence/src/main/java ${{github.workspace}}/persistence-api/src/main/java ${{github.workspace}}/search-api/src/main/java ${{github.workspace}}/search-solr/src/main/java ${{github.workspace}}/services-camel-app/src/main/java ${{github.workspace}}/web-access-app/src/main/java ${{github.workspace}}/web-access-war/src/main/java ${{github.workspace}}/web-admin-app/src/main/java ${{github.workspace}}/web-common/src/main/java ${{github.workspace}}/web-services-app/src/main/java ${{github.workspace}}/web-sword/src/main/java ${{github.workspace}}/clamav-java/src/main/java"
# with:
# coverageCommand: mvn -pl integration verify
# coverageLocations: |
# ${{github.workspace}}/**/target/site/jacoco/jacoco.xml:jacoco
# ${{github.workspace}}/**/target/site/jacoco-it/jacoco.xml:jacoco
# ${{github.workspace}}/static/js/vue-cdr-access/coverage/lcov.info:lcov
# ${{github.workspace}}/static/js/admin/vue-permissions-editor/coverage/lcov.info:lcov
#
# - name: View fedora service logs
# if: always()
# run: |
# docker logs ${{ env.CONTAINER_ID }}
1 change: 1 addition & 0 deletions etc/solr-config/access/solrcore.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
name=access

0 comments on commit 714c275

Please sign in to comment.