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.

Sign up for GitHub

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

Add statistics for year 2023 #37

Merged
merged 4 commits into from
Sep 20, 2023
Merged

Add statistics for year 2023 #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7574f8e
Update PageGenerator.scala
xorelvistor Sep 19, 2023
c9613c6
Add ID of public document for year 2023
xorelvistor Sep 20, 2023
0d5710c
Fix CI build by using a newer OpenJDK image. This also switches from …
v6ak Sep 20, 2023
f55283f
Change end time
xorelvistor Sep 20, 2023
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
16 changes: 8 additions & 8 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,23 @@
# to use for the JDK to install.

# We need JDK 8, as it does not compile with JDK 11 for some unknown reason.
ARG OPENJDK_TAG=8u212
ARG OPENJDK_TAG=8

# First stage just determines SBT version. If build.properties changes without changing the SBT version, it just rebuilds the first stage without rebuilding the second stage.
FROM openjdk:${OPENJDK_TAG} AS sbt-version
FROM amazoncorretto:${OPENJDK_TAG} AS sbt-version
COPY project/build.properties /
#RUN sed -n -e 's/^sbt\.version=//p' /build.properties > /version
# The old version has some weird dependency on Java 6, so we download a newer version which will download the old version then…
RUN echo 1.1.1 > /version

# Second stage creates final image with the right SBT version
FROM openjdk:${OPENJDK_TAG}
FROM amazoncorretto:${OPENJDK_TAG}
COPY --from=sbt-version /version /sbt-version
RUN \
curl -L -o sbt-$(cat /sbt-version).deb https://scala.jfrog.io/ui/api/v1/download\?repoKey=debian\&path=%252Fsbt-$(cat /sbt-version).deb && \
dpkg -i sbt-$(cat /sbt-version).deb && \
rm sbt-$(cat /sbt-version).deb && \
curl -L -o sbt-$(cat /sbt-version).rpm https://scala.jfrog.io/ui/api/v1/download\?repoKey=rpm\&path=%252Fsbt-$(cat /sbt-version).rpm && \
echo SBT launcher downloaded && \
rpm -i sbt-$(cat /sbt-version).rpm && \
rm sbt-$(cat /sbt-version).rpm && \
sbt sbtVersion && \
mkdir /project
WORKDIR /project
RUN apt-get update && apt-get install -y rsync lftp nodejs zip
RUN yum install -y rsync lftp nodejs zip unzip which
5 changes: 5 additions & 0 deletions project/PageGenerator.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,11 @@ Year(
year = 2022, formatVersion = 2021,
startTime = "2022-09-16 17:30", endTime = "2022-09-17 20:00",
dataSource= NewGoogleSpreadsheetDataSource("2PACX-1vQEmRVRc1DBm9PZoRU-4oKu0p6gTWqv6lYbvvrDwGT-umiXtB4Xy13NEcFeanZ37PTw2UrN8TYaHK15")
),
Year(
year = 2023, formatVersion = 2021,
startTime = "2023-09-15 17:30", endTime = "2023-09-16 18:10",
dataSource= NewGoogleSpreadsheetDataSource("2PACX-1vTzrUrHEarwmtqap2WZQRMJvO7UVy6rGln2xuZv5kWa_slIM6c_-p7BasSUkipAJs86iIOwWDtJlrlb")
)
)

Expand Down
Loading