Merge branch 'main' into patch-12

Author: spmorrison

.gitattributes

@@ -0,0 +1,6 @@
+# Apply LF line endings to all Perl files
+*.pl text eol=lf
+*.pm text eol=lf
+
+# Apply LF line endings to all .adoc files in the docs directory
+/docs/**/*.adoc text eol=lf

.github/workflows/docs.yml

@@ -22,3 +22,16 @@ jobs:
           name: built-docs
           path: docs/output
           retention-days: 2
+  check_docs_styles:
+    name: Check docs styles
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Install asciidoctor
+        run: sudo apt-get install -y asciidoctor
+      - name: Install vale
+        run: pip install vale
+      - name: Download and install vale rules
+        run: cd docs && vale sync
+      - name: Check documentation against DIG style guide
+        run: cd docs && vale modules

.github/workflows/ng-build.yml

@@ -0,0 +1,29 @@
+name: Run ng build --configuration production
+on:
+  push:
+    paths:
+      - '.github/workflows/**'
+      - 'Open-ILS/src/eg2/**'
+  pull_request:
+    paths:
+      - '.github/workflows/**'
+      - 'Open-ILS/src/eg2/**'
+defaults:
+  run:
+    working-directory: Open-ILS/src/eg2
+jobs:
+  lint:
+    name: Run Angular build
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 22
+          cache: 'npm'
+          cache-dependency-path: Open-ILS/src/eg2/package-lock.json
+      - name: Install dependencies
+        run: npm ci --ignore-scripts
+      - name: build
+        run: npx ng build --configuration production
+

.github/workflows/ng-lint.yml

@@ -17,7 +17,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 22
           cache: 'npm'
           cache-dependency-path: Open-ILS/src/eg2/package-lock.json
       - name: Install dependencies

.github/workflows/opac-unit-tests.yml

@@ -17,7 +17,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 22
           cache: 'npm'
           cache-dependency-path: Open-ILS/web/opac/deps/package-lock.json
       - name: Install dependencies

.github/workflows/pgtap.yml

@@ -0,0 +1,87 @@
+name: Run pgtap tests
+on:
+  push:
+    paths:
+      - '.github/workflows/**'
+      - 'Open-ILS/src/sql/**'
+      - 'Open-ILS/tests/datasets/**'
+  pull_request:
+    paths:
+      - '.github/workflows/**'
+      - 'Open-ILS/src/sql/**'
+      - 'Open-ILS/tests/datasets/**'
+  workflow_dispatch:
+
+env:
+  PGHOST: localhost
+  PGPASSWORD: postgres
+  PGPORT: 5432
+  PGUSER: postgres
+
+jobs:
+  pgtap:
+    name: Run PgTap tests
+    runs-on: ubuntu-22.04
+    strategy:
+      matrix:
+        pg-version: [13, 14, 15, 16, 17]
+      fail-fast: false
+    steps:
+      - uses: actions/checkout@v4
+
+      # The Github actions jammy image comes with postgres 14 installed.  To test other postgres
+      # versions, we need to remove 14 first
+      - name: Delete the postgres 14 cluster that comes with the github actions ubuntu image
+        run: sudo pg_dropcluster --stop 14 main
+        if: matrix.pg-version != 14
+      - name: Remove any postgres that is already installed in the github actions ubuntu image
+        run: sudo apt remove -y postgres*
+        if: matrix.pg-version != 14
+
+      # Next, let's install dependencies
+      - name: Install postgres and dependencies
+        run: sudo make -f Open-ILS/src/extras/Makefile.install postgres-server-ubuntu-jammy-${{ matrix.pg-version }}
+      - name: Install libdbi-perl
+        run: sudo apt update && sudo apt install -y libdbi-perl
+      - name: Install pg_prove
+        run: sudo cpan -T TAP::Parser::SourceHandler::pgTAP
+        env:
+          SHELL: /bin/bash
+      - name: Checkout the pgtap repository
+        uses: actions/checkout@v4
+        with:
+          repository: theory/pgtap
+          path: pgtap
+          ref: v1.3.2
+
+      # Start up postgres
+      - name: start postgres cluster
+        run: sudo pg_ctlcluster ${{ matrix.pg-version }} main start
+      - name: change postgres to a known password
+        run: sudo -u postgres psql -c "ALTER USER postgres WITH PASSWORD '$PGPASSWORD'"
+
+      # Create the needed database, extensions, schema, and data
+      - name: Install database extensions
+        run: psql --file create_database_extensions.sql -v db_name=evergreen
+        working-directory: Open-ILS/src/sql/Pg
+      - name: Install pgtap extension
+        working-directory: pgtap
+        run: make && psql --dbname evergreen --file sql/pgtap.sql
+      - name: Build database
+        run: "./build-db.sh $PGHOST $PGPORT evergreen $PGUSER $PGPASSWORD 1"
+        working-directory: Open-ILS/src/sql/Pg
+      - name: Load sample data
+        run: psql --dbname evergreen --file load_all.sql
+        working-directory: Open-ILS/tests/datasets/sql/concerto
+
+      # Now, let's run the tests!
+      - name: Run pgtap tests
+        run: pg_prove --dbname evergreen t
+        working-directory: Open-ILS/src/sql/Pg
+      - name: Run pgtap regression tests
+        run: pg_prove --dbname evergreen t/regress
+        working-directory: Open-ILS/src/sql/Pg
+      - name: Run pgtap live tests
+        run: pg_prove --dbname evergreen live_t
+        working-directory: Open-ILS/src/sql/Pg
+

.gitignore

@@ -365,3 +365,13 @@ Open-ILS/web/opac/deps/node_modules/
 
 # Ignore O/S-specific hidden files
 .DS_Store
+
+# Docker DEV container uses these
+docker-watch.sh
+db_control.txt
+db_switch.log
+eg_restart_go_screenoutput
+eg_restart_go
+eg_rebuild_angular_screenoutput
+eg_rebuild_angular
+watch.LOCK

ChangeLog

@@ -1,3 +1,2 @@
-Evergreen doesn't keep a GNU-style ChangeLog except in release tarballs.
-Those seeking a change log are encouraged to run 'git log -v', or read
-it online at: http://git.evergreen-ils.org/?p=Evergreen.git;a=log
+Release notes can be found in the docs/RELEASE_NOTES_* file for
+the version of Evergreen that you are installing.

Open-ILS/examples/apache_24/eg_vhost.conf.in

@@ -85,6 +85,14 @@ OSRFTranslatorConfig @sysconfdir@/opensrf_core.xml
     Require all granted 
 </Location>
 
+# Eresource link click tracker
+<Location /opac/extras/eresource_link_click_track>
+    SetHandler perl-script
+    PerlHandler OpenILS::WWW::EResourceLinkClick
+    PerlSendHeader On
+    Require all granted
+</Location>
+
 # Flattener service
 <Location /opac/extras/flattener>
     SetHandler perl-script

Open-ILS/examples/crontab.example

@@ -103,5 +103,10 @@ EG_BIN_DIR = /openils/bin
 # Clean out action.hold_request_reset_reason_entry table
 0 1 * * * . ~/.bashrc && $EG_BIN_DIR/purge_hold_reset_reason_entries.srfsh
 
+# Delete old link click analytics that are no longer needed after
+# the given number of days (365 by default)
+#0 1 * * * cd /openils/bin && /usr/bin/perl ./delete_old_eresource_link_clicks.pl > /dev/null
+
+
 # TODO: add other entries