Skip to content

Commit d033cd1

Browse files
kelvinqian00kelvinqian00
committed
Merge branch 'main' into reactions-tutorial
2 parents f34d251 + 8a774bb commit d033cd1

File tree

14 files changed

+376
-38
lines changed

14 files changed

+376
-38
lines changed

‎.github/workflows/build.yml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- name: Checkout repository
15-
uses: actions/checkout@v3
15+
uses: actions/checkout@v4
1616

1717
- name: List Java modules
1818
id: echo-modules
@@ -23,7 +23,7 @@ jobs:
2323

2424
build_jre:
2525
needs: get_modules
26-
uses: yetanalytics/runtimer/.github/workflows/runtimer.yml@0.1.3-java-11-temurin
26+
uses: yetanalytics/workflow-runtimer/.github/workflows/runtimer.yml@v1
2727
with:
2828
java-version: '11'
2929
java-distribution: 'temurin'
@@ -34,28 +34,28 @@ jobs:
3434
needs: build_jre
3535
steps:
3636
- name: Checkout repository
37-
uses: actions/checkout@v3
37+
uses: actions/checkout@v4
3838

3939
- name: Setup CI Environment
40-
uses: yetanalytics/actions/setup-env@v0.0.4
40+
uses: yetanalytics/action-setup-env@v2
4141

4242
# BUILD WITHOUT RUNTIME
4343
- name: Build Bundle
4444
run: make bundle BUNDLE_RUNTIMES=false
4545

4646
# GET RUNTIMES FROM ARTIFACTS
4747
- name: Download ubuntu-latest Artifact
48-
uses: actions/download-artifact@v3
48+
uses: actions/download-artifact@v4
4949
with:
5050
name: ubuntu-20.04-jre
5151

5252
- name: Download macOS-latest Artifact
53-
uses: actions/download-artifact@v3
53+
uses: actions/download-artifact@v4
5454
with:
5555
name: macos-12-jre
5656

5757
- name: Download windows-latest Artifact
58-
uses: actions/download-artifact@v3
58+
uses: actions/download-artifact@v4
5959
with:
6060
name: windows-2022-jre
6161

@@ -78,14 +78,14 @@ jobs:
7878
7979
- name: Archive Bundle (Branch Pushes)
8080
if: ${{ github.ref_type == 'branch' }}
81-
uses: actions/upload-artifact@v3
81+
uses: actions/upload-artifact@v4
8282
with:
8383
name: lrsql-artifact-${{ github.sha }}
8484
path: lrsql.zip
8585

8686
- name: Archive Bundle (Tag Pushes)
8787
if: ${{ github.ref_type == 'tag' }}
88-
uses: actions/upload-artifact@v3
88+
uses: actions/upload-artifact@v4
8989
with:
9090
name: lrsql-artifact-${{ github.ref_name }}
9191
path: lrsql.zip
@@ -96,10 +96,10 @@ jobs:
9696
if: ${{ github.ref_type == 'tag' }}
9797
steps:
9898
- name: Checkout repository
99-
uses: actions/checkout@v3
99+
uses: actions/checkout@v4
100100

101101
- name: Download Bundle Artifact
102-
uses: actions/download-artifact@v3
102+
uses: actions/download-artifact@v4
103103
with:
104104
name: lrsql-artifact-${{ github.ref_name }}
105105

@@ -109,7 +109,7 @@ jobs:
109109
unzip lrsql.zip -d target/bundle
110110
111111
- name: Craft Draft Release
112-
uses: softprops/action-gh-release@v1
112+
uses: softprops/action-gh-release@v2
113113
with:
114114
# Defaults:
115115
# name: [tag name]
@@ -119,25 +119,25 @@ jobs:
119119
files: lrsql.zip
120120

121121
- name: Deploy Documentation
122-
uses: JamesIves/github-pages-deploy-action@v4.4.1
122+
uses: JamesIves/github-pages-deploy-action@v4.6.4
123123
with:
124124
branch: gh-pages
125125
folder: target/bundle/doc
126126

127127
- name: Log in to Docker Hub
128-
uses: docker/login-action@v2
128+
uses: docker/login-action@v3
129129
with:
130130
username: ${{ secrets.DOCKER_USERNAME }}
131131
password: ${{ secrets.DOCKER_TOKEN }}
132132

133133
- name: Extract metadata (tags, labels) for Docker
134134
id: meta
135-
uses: docker/metadata-action@v4
135+
uses: docker/metadata-action@v5
136136
with:
137137
images: yetanalytics/lrsql
138138

139139
- name: Build and push Docker image
140-
uses: docker/build-push-action@v3
140+
uses: docker/build-push-action@v6
141141
with:
142142
context: .
143143
push: true

‎.github/workflows/deps.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ jobs:
1010
timeout-minutes: 10
1111
steps:
1212
- name: Checkout project
13-
uses: actions/checkout@v3
13+
uses: actions/checkout@v4
1414

1515
- name: Setup CI Environment
16-
uses: yetanalytics/action-setup-env@v1
16+
uses: yetanalytics/action-setup-env@v2
1717

1818
- name: Cache Deps
19-
uses: actions/cache@v3
19+
uses: actions/cache@v4
2020
with:
2121
path: |
2222
~/.m2

‎.github/workflows/nvd.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66

77
jobs:
88
nvd_scan:
9-
uses: yetanalytics/workflow-nvd/.github/workflows/nvd-scan.yml@v1
9+
uses: yetanalytics/workflow-nvd/.github/workflows/nvd-scan.yml@v2
1010
with:
1111
nvd-clojure-version: "3.3.0"
1212
classpath-command: "clojure -Spath -Adb-sqlite:db-postgres"

‎.github/workflows/test.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ on: push
44

55
jobs:
66
nvd_scan:
7-
uses: yetanalytics/workflow-nvd/.github/workflows/nvd-scan.yml@v1
7+
uses: yetanalytics/workflow-nvd/.github/workflows/nvd-scan.yml@v2
88
with:
99
nvd-clojure-version: "3.3.0"
1010
classpath-command: "clojure -Spath -Adb-sqlite:db-postgres"
1111
nvd-config-filename: ".nvd/config.json"
1212

1313
lint:
14-
uses: yetanalytics/workflow-linter/.github/workflows/linter.yml@v2023.01.20
14+
uses: yetanalytics/workflow-linter/.github/workflows/linter.yml@v2024.08.01
1515
with:
1616
lint-directories: "src/bench src/build src/db src/main src/test"
1717

@@ -31,10 +31,10 @@ jobs:
3131

3232
steps:
3333
- name: Checkout repository
34-
uses: actions/checkout@v3
34+
uses: actions/checkout@v4
3535

3636
- name: Setup CI Environment
37-
uses: yetanalytics/actions/setup-env@v0.0.4
37+
uses: yetanalytics/action-setup-env@v2
3838

3939
- name: Run Makefile Target ${{ matrix.target }}
4040
run: make ${{ matrix.target }}

‎.nvd/suppression.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,12 @@
1818
<cpe>cpe:/a:clojure:clojure</cpe>
1919
<cve>CVE-2017-20189</cve>
2020
</suppress>
21+
<!-- TODO: Remove suppression once we update to Jetty 12 -->
22+
<suppress>
23+
<notes><![CDATA[
24+
file name: jetty-http-9.4.54.v20240208.jar
25+
]]></notes>
26+
<packageUrl regex="true">^pkg:maven/org\.eclipse\.jetty/jetty\-http@.*$</packageUrl>
27+
<vulnerabilityName>CVE-2024-6763</vulnerabilityName>
28+
</suppress>
2129
</suppressions>

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
# Version of LRS Admin UI to use
44

5-
LRS_ADMIN_UI_VERSION ?= v0.1.23
5+
LRS_ADMIN_UI_VERSION ?= v0.1.24
66
LRS_ADMIN_UI_LOCATION ?= https://github.com/yetanalytics/lrs-admin-ui/releases/download/${LRS_ADMIN_UI_VERSION}/lrs-admin-ui.zip
77
LRS_ADMIN_ZIPFILE ?= lrs-admin-ui-${LRS_ADMIN_UI_VERSION}.zip
88

‎README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ For releases and release notes, see the [Releases](https://github.com/yetanalyti
5454
### Demos
5555

5656
- [Visualization with Apache Superset](doc/superset.md)
57+
- [Additional Configuration Demos](doc/other_demos.md)
5758

5859
## Contribution
5960

‎deps.edn

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
aero/aero {:mvn/version "1.1.6"}
1717
selmer/selmer {:mvn/version "1.12.59"}
1818
ch.qos.logback/logback-classic {:mvn/version "1.3.14"}
19+
commons-io/commons-io {:mvn/version "2.14.0"}
1920
;; DB/JDBC deps
2021
;; - HikariCP: Need to exclude slf4j to make logback work properly
2122
;; - HugSql: Use custom version instead of the released version (0.5.1)
@@ -26,10 +27,15 @@
2627
com.zaxxer/HikariCP {:mvn/version "5.0.0"
2728
:exclusions [org.slf4j/slf4j-api]}
2829
;; Pedestal and Jetty webserver deps
29-
io.pedestal/pedestal.jetty {:mvn/version "0.6.3"
30-
:exclusions [org.eclipse.jetty.http2/http2-server]}
31-
org.eclipse.jetty.http2/http2-server {:mvn/version "9.4.54.v20240208"}
32-
org.eclipse.jetty/jetty-alpn-java-server {:mvn/version "9.4.54.v20240208"}
30+
io.pedestal/pedestal.jetty {:mvn/version "0.6.3"}
31+
org.eclipse.jetty/jetty-server {:mvn/version "9.4.56.v20240826"}
32+
org.eclipse.jetty/jetty-servlet {:mvn/version "9.4.56.v20240826"}
33+
org.eclipse.jetty/jetty-alpn-server {:mvn/version "9.4.56.v20240826"}
34+
org.eclipse.jetty.http2/http2-server {:mvn/version "9.4.56.v20240826"}
35+
org.eclipse.jetty/jetty-alpn-java-server {:mvn/version "9.4.56.v20240826"}
36+
org.eclipse.jetty.websocket/websocket-api {:mvn/version "9.4.56.v20240826"}
37+
org.eclipse.jetty.websocket/websocket-servlet {:mvn/version "9.4.56.v20240826"}
38+
org.eclipse.jetty.websocket/websocket-server {:mvn/version "9.4.56.v20240826"}
3339
;; Security deps
3440
buddy/buddy-core {:mvn/version "1.11.418"
3541
:exclusions [org.bouncycastle/bcprov-jdk18on
@@ -43,15 +49,15 @@
4349
less-awful-ssl/less-awful-ssl {:mvn/version "1.0.6"}
4450
xyz.capybara/clamav-client {:mvn/version "2.1.2"}
4551
;; Yet Analytics deps
46-
52+
4753
com.yetanalytics/lrs
48-
{:mvn/version "1.2.19"
54+
{:mvn/version "1.2.21"
4955
:exclusions [org.clojure/clojure
5056
org.clojure/clojurescript
5157
com.yetanalytics/xapi-schema]}
5258

5359
com.yetanalytics/xapi-schema
54-
{:mvn/version "1.3.0"
60+
{:mvn/version "1.4.0"
5561
:exclusions [org.clojure/clojure
5662
org.clojure/clojurescript]}
5763
com.yetanalytics/colossal-squuid

0 commit comments

Comments
 (0)