Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
haskell-gargantext
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
159
Issues
159
List
Board
Labels
Milestones
Merge Requests
7
Merge Requests
7
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
gargantext
haskell-gargantext
Commits
0534bf05
Commit
0534bf05
authored
Mar 24, 2025
by
Alexandre Delanoë
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/dev-456-istex-tls-fix' into dev
parents
e9301e4e
9ad77ad6
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
10 deletions
+10
-10
update-project-dependencies
bin/update-project-dependencies
+1
-1
cabal.project
cabal.project
+1
-1
docker-compose.yaml
devops/docker/docker-compose.yaml
+7
-7
stack.yaml
stack.yaml
+1
-1
No files found.
bin/update-project-dependencies
View file @
0534bf05
...
@@ -16,7 +16,7 @@ fi
...
@@ -16,7 +16,7 @@ fi
# with the `sha256sum` result calculated on the `cabal.project` and
# with the `sha256sum` result calculated on the `cabal.project` and
# `cabal.project.freeze`. This ensures the files stay deterministic so that CI
# `cabal.project.freeze`. This ensures the files stay deterministic so that CI
# cache can kick in.
# cache can kick in.
expected_cabal_project_hash
=
"
37352ca36ca5e69d9945da11439be4c3909297b338242855fa588dffdf1ba02b"
expected_cabal_project_hash
=
"
0ce011cd483078936fe3385b3e0c90231774fd2ac05bfb9f4c646345a0208d66"
expected_cabal_project_freeze_hash
=
"cd52143d3a9d285360b59c6371d3e258552c1bc115bd612024db3de1f7593ff7"
expected_cabal_project_freeze_hash
=
"cd52143d3a9d285360b59c6371d3e258552c1bc115bd612024db3de1f7593ff7"
...
...
cabal.project
View file @
0534bf05
...
@@ -72,7 +72,7 @@ source-repository-package
...
@@ -72,7 +72,7 @@ source-repository-package
source
-
repository
-
package
source
-
repository
-
package
type
:
git
type
:
git
location
:
https
://
gitlab
.
iscpif
.
fr
/
gargantext
/
crawlers
/
istex
.
git
location
:
https
://
gitlab
.
iscpif
.
fr
/
gargantext
/
crawlers
/
istex
.
git
tag
:
521
ca54f1502b13f629eff2223aaf5007e6d52ec
tag
:
894482
ef97eadce6b1c13ebced1edfe394b5be5e
source
-
repository
-
package
source
-
repository
-
package
type
:
git
type
:
git
...
...
devops/docker/docker-compose.yaml
View file @
0534bf05
version
:
'
3'
version
:
'
3'
services
:
services
:
caddy
:
#
caddy:
image
:
caddy:alpine
#
image: caddy:alpine
ports
:
#
ports:
-
8108:8108
#
- 8108:8108
volumes
:
#
volumes:
-
./Caddyfile:/etc/caddy/Caddyfile:ro
#
- ./Caddyfile:/etc/caddy/Caddyfile:ro
-
../../purescript-gargantext:/srv/purescript-gargantext:ro
#
- ../../purescript-gargantext:/srv/purescript-gargantext:ro
#postgres11:
#postgres11:
# #image: 'postgres:latest'
# #image: 'postgres:latest'
...
...
stack.yaml
View file @
0534bf05
...
@@ -158,7 +158,7 @@
...
@@ -158,7 +158,7 @@
git
:
"
https://gitlab.iscpif.fr/gargantext/crawlers/isidore.git"
git
:
"
https://gitlab.iscpif.fr/gargantext/crawlers/isidore.git"
subdirs
:
subdirs
:
-
.
-
.
-
commit
:
521ca54f1502b13f629eff2223aaf5007e6d52ec
-
commit
:
894482ef97eadce6b1c13ebced1edfe394b5be5e
git
:
"
https://gitlab.iscpif.fr/gargantext/crawlers/istex.git"
git
:
"
https://gitlab.iscpif.fr/gargantext/crawlers/istex.git"
subdirs
:
subdirs
:
-
.
-
.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment