Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

syncying recent changes from dataquest #8

Merged
merged 52 commits into from
Nov 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
714db54
copying assetstore from dev-5 to instance
Paurikova2 Jun 20, 2024
a0606cd
removed -r flag
Paurikova2 Jun 20, 2024
1b2b08e
redefination of input
Paurikova2 Jun 20, 2024
57312bf
added -r flag
Paurikova2 Jun 20, 2024
3a5abe6
replaced cp by docker cp
Paurikova2 Jun 20, 2024
c4cc77a
removed assetstore and add path to python
Paurikova2 Jun 20, 2024
506d79c
TEST: assesttore
Paurikova2 Jun 20, 2024
29b376d
removed only assetstore not all from dspace
Paurikova2 Jun 20, 2024
4c4992d
removed removing assetstore - it is part of erase database, not import
Paurikova2 Jun 20, 2024
499d648
run import on the main branch
Paurikova2 Jun 21, 2024
7d37f8f
empty assetstore control
Paurikova2 Jun 21, 2024
d08cf6d
test assetstore folder
Paurikova2 Jun 21, 2024
8ea5872
correct branch after test
Paurikova2 Jun 24, 2024
ed77a35
Copying the assetstore from dev-5 to a running instance of dspace
Paurikova2 Jun 24, 2024
70ee4cc
forgotten slash
Paurikova2 Jun 24, 2024
28edc82
assetstore path forgotten slash
Paurikova2 Jun 24, 2024
5522177
add timezone into version (#645)
MajoBerger Jun 26, 2024
e40dc88
Cleanup of old actions and scripts (#646)
MajoBerger Jun 26, 2024
c777c6d
added ZCU import action
Paurikova2 Jul 9, 2024
9542269
wrong sql path
Paurikova2 Jul 9, 2024
fbc0dee
dump file
Paurikova2 Jul 9, 2024
1435627
[devOps] fix indentation
Paurikova2 Jul 9, 2024
a0e9cf4
update deploy for zcu to enable import
MajoBerger Jul 10, 2024
811ada2
moved deploy of ZCU to zcu branch
MajoBerger Jul 10, 2024
03a7e2f
removed ZCU option that is not used
MajoBerger Jul 10, 2024
32e248d
Added submission note info into workflow item view (#656)
milanmajchrak Jul 17, 2024
1b6ff9d
Added favicon.svg because it throws console error - New PR because of…
milanmajchrak Jul 17, 2024
dcbeb19
try older version of import
MajoBerger Jul 18, 2024
a1edcd9
The input field is hidden when it is defined `style` as `d-none` (#661)
milanmajchrak Jul 18, 2024
0b9b06d
UFAL/Notification step - the user must confirm he had read the notice…
milanmajchrak Jul 18, 2024
3097767
Added missing messages for the language facet (#665)
milanmajchrak Jul 23, 2024
b81dbfd
set up handle server to auto-deploy (#664)
MajoBerger Jul 24, 2024
18aa6dc
reverted revert, works on "my machine", hopefully the backend was not…
Jul 24, 2024
8f13cd7
Merge pull request #3095 from tdonohue/port_2761_to_7x (#668)
milanmajchrak Jul 26, 2024
7800263
correct entrypoint (#672)
MajoBerger Jul 30, 2024
533d8d1
handle and port expose (#673)
MajoBerger Aug 1, 2024
2ee7acb
allow deleting instance 4 (#680)
MajoBerger Aug 5, 2024
a2d30b4
removed IP metadatakey from request (#681)
Paurikova2 Aug 12, 2024
9840018
removed SEND_TOKEN from required info (#685)
Paurikova2 Aug 20, 2024
e216a93
use correct timezone in version info (#658)
MajoBerger Aug 27, 2024
b95ba37
Internal/Copy fixes from the ZCU (#711)
milanmajchrak Sep 9, 2024
c0c12ac
Removed dynamic overflow because every content must be scrollable.. (…
milanmajchrak Sep 20, 2024
082d14b
add tar for preview (#713)
Paurikova2 Sep 20, 2024
575e3b9
UFAL/Enhanced type-bind feature (#714)
milanmajchrak Sep 20, 2024
1178fae
Updated error message when tests failed
milanmajchrak Sep 25, 2024
083f2b5
Update README.md
vidiecan Oct 11, 2024
b2a5d6e
UFAL/Show sesznam license on approval page (#722)
milanmajchrak Oct 17, 2024
d164ec7
UFAL/share submission by email (#720)
milanmajchrak Oct 17, 2024
791dfd9
UFAL/Autocomplete enhancement (#718)
milanmajchrak Oct 17, 2024
ae42453
UFAL/License page - wrong layout in Firefox (#721)
milanmajchrak Oct 30, 2024
bd55322
Migrated Vanilla cs messages into clarin 7.6.1. cs messages (#669)
milanmajchrak Nov 4, 2024
08e7076
Merge branch 'clarin-v7' into HEAD
kosarko Nov 6, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 29 additions & 3 deletions .github/actions/import-db/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ inputs:
description: 'port suffix'
required: true
type: string
ASSETSTORE:
description: 'location of assetstore folder'
required: false
type: string

runs:
using: "composite"
Expand Down Expand Up @@ -49,17 +53,39 @@ runs:
echo "====="
docker logs $DB5NAME || true
echo "====="
# copy assetstore
echo Preparing assetstore
if [[ -z ${{ inputs.ASSETSTORE }} ]]; then
echo Location of assetstore folder is empty. Not copping assetstore
else
docker cp ${{ inputs.ASSETSTORE }} dspace${{ inputs.INSTANCE }}:/dspace/
fi
echo "====="
cd ../
pip install -r requirements.txt || true
echo "====="
cd ./src
# cleanup resume
rm __temp/resume/*.json || true
python3 repo_import.py --resume=false --config=backend.endpoint=$BEURL --config=db_dspace_7.port=$DB7PORT --config=db_dspace_5.port=$DB5PORT --config=db_utilities_5.port=$DB5PORT --config=input.datadir=$DATADIR/data/ --config=input.icondir=$DATADIR/icon/

# arguments of the script
# required
args=(
--resume=false
--config=backend.endpoint=$BEURL
--config=db_dspace_7.port=$DB7PORT
--config=db_dspace_5.port=$DB5PORT
--config=db_utilities_5.port=$DB5PORT
--config=input.datadir=$DATADIR/data/
--config=input.icondir=$DATADIR/icon/
)
# Add --resume argument if inputs.ASSETSTORE is defined
if [ -n "${{ inputs.ASSETSTORE }}" ]; then
args+=(--assetstore=${{ inputs.ASSETSTORE }})
fi
python3 repo_import.py "${args[@]}"
- name: cleanup
shell: bash
run: |
docker stop ${{ steps.import.outputs.cid }} || true
if: ${{ always() }}

10 changes: 0 additions & 10 deletions .github/actions/project-management-action/Dockerfile

This file was deleted.

21 changes: 0 additions & 21 deletions .github/actions/project-management-action/LICENSE

This file was deleted.

132 changes: 0 additions & 132 deletions .github/actions/project-management-action/README.md

This file was deleted.

22 changes: 0 additions & 22 deletions .github/actions/project-management-action/action.yml

This file was deleted.

150 changes: 0 additions & 150 deletions .github/actions/project-management-action/entrypoint.sh

This file was deleted.

Loading
Loading