(struts-site) branch fix/jekyll created (now 33cebe9fe)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch fix/jekyll in repository https://gitbox.apache.org/repos/asf/struts-site.git at 33cebe9fe Simplifies website build This branch includes the following new commits: new 33cebe9fe Simplifies website build The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(struts-site) 01/01: Simplifies website build
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch fix/jekyll
in repository https://gitbox.apache.org/repos/asf/struts-site.git
commit 33cebe9fe3508ddeaad59246d23bc17c7882206c
Author: Lukasz Lenart
AuthorDate: Sat Aug 10 09:29:24 2024 +0200
Simplifies website build
---
Dockerfile| 11 +++
Jenkinsfile | 4 +---
docker-arm64-serve.sh | 3 ++-
3 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0..36fc04f78
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,11 @@
+FROM ruby:3.2.5
+
+WORKDIR /var/jekyll
+
+COPY . .
+
+RUN gem install bundler jekyll
+
+CMD ["bundle", "exec", "jekyll", "serve", "--host=0.0.0.0", "--incremental"]
+
+EXPOSE 4000
\ No newline at end of file
diff --git a/Jenkinsfile b/Jenkinsfile
index 1d0201294..de4b794af 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -21,10 +21,8 @@ pipeline {
sh '''
echo Generating a new version of website
- gem install --install-dir ${GEM_HOME} bundler -v '2.3.23'
-
+ gem install --install-dir ${GEM_HOME} bundler jekyll
bundle config set --local path ${GEM_HOME}
- bundle install
bundle exec jekyll build
'''
}
diff --git a/docker-arm64-serve.sh b/docker-arm64-serve.sh
index 9cdf262ca..6563d02dc 100644
--- a/docker-arm64-serve.sh
+++ b/docker-arm64-serve.sh
@@ -1,3 +1,4 @@
#!/bin/sh
-docker run --rm -v "$PWD:/var/jekyll" -p 4000:4000 -it
mrxder/jekyll-docker-arm64:latest jekyll serve --host=0.0.0.0 --incremental
+docker build -t struts-jekyll .
+docker run --rm -v "$PWD:/var/jekyll" -p 4000:4000 -it struts-jekyll
(struts-site) 01/01: Simplifies website build
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch fix/jekyll
in repository https://gitbox.apache.org/repos/asf/struts-site.git
commit e2a2a6c91d1effa485852053ef6fc07dde2fa23e
Author: Lukasz Lenart
AuthorDate: Sat Aug 10 09:29:24 2024 +0200
Simplifies website build
---
Dockerfile| 11 +++
Jenkinsfile | 5 ++---
docker-arm64-serve.sh | 3 ++-
3 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0..36fc04f78
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,11 @@
+FROM ruby:3.2.5
+
+WORKDIR /var/jekyll
+
+COPY . .
+
+RUN gem install bundler jekyll
+
+CMD ["bundle", "exec", "jekyll", "serve", "--host=0.0.0.0", "--incremental"]
+
+EXPOSE 4000
\ No newline at end of file
diff --git a/Jenkinsfile b/Jenkinsfile
index 1d0201294..1c5c4b89d 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -21,10 +21,9 @@ pipeline {
sh '''
echo Generating a new version of website
- gem install --install-dir ${GEM_HOME} bundler -v '2.3.23'
-
+ gem install --install-dir ${GEM_HOME} bundler jekyll
bundle config set --local path ${GEM_HOME}
- bundle install
+ gem install
bundle exec jekyll build
'''
}
diff --git a/docker-arm64-serve.sh b/docker-arm64-serve.sh
index 9cdf262ca..6563d02dc 100644
--- a/docker-arm64-serve.sh
+++ b/docker-arm64-serve.sh
@@ -1,3 +1,4 @@
#!/bin/sh
-docker run --rm -v "$PWD:/var/jekyll" -p 4000:4000 -it
mrxder/jekyll-docker-arm64:latest jekyll serve --host=0.0.0.0 --incremental
+docker build -t struts-jekyll .
+docker run --rm -v "$PWD:/var/jekyll" -p 4000:4000 -it struts-jekyll
(struts-site) branch fix/jekyll updated (33cebe9fe -> e2a2a6c91)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch fix/jekyll in repository https://gitbox.apache.org/repos/asf/struts-site.git discard 33cebe9fe Simplifies website build new e2a2a6c91 Simplifies website build This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (33cebe9fe) \ N -- N -- N refs/heads/fix/jekyll (e2a2a6c91) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: Jenkinsfile | 1 + 1 file changed, 1 insertion(+)
(struts) 01/01: Merge pull request #1013 from apache/WW-4062-ognl-exc-cache
This is an automated email from the ASF dual-hosted git repository. kusal pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/struts.git commit 663dd3a50c0325fcf5aa0c5207d2c3d23f55f138 Merge: a4464099d 6caa932ff Author: Kusal Kithul-Godage AuthorDate: Sat Aug 10 19:00:41 2024 +1000 Merge pull request #1013 from apache/WW-4062-ognl-exc-cache WW-4062 Cache OgnlException thrown on compilation .../java/com/opensymphony/xwork2/ognl/OgnlUtil.java | 17 - .../java/com/opensymphony/xwork2/ognl/OgnlUtilTest.java | 15 +++ 2 files changed, 31 insertions(+), 1 deletion(-)
(struts) branch master updated (a4464099d -> 663dd3a50)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/struts.git from a4464099d Merge pull request #1006 from apache/dependabot/github_actions/ossf/scorecard-action-2.4.0 add 6caa932ff WW-4062 Cache OgnlException thrown on compilation new 663dd3a50 Merge pull request #1013 from apache/WW-4062-ognl-exc-cache The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../java/com/opensymphony/xwork2/ognl/OgnlUtil.java | 17 - .../java/com/opensymphony/xwork2/ognl/OgnlUtilTest.java | 15 +++ 2 files changed, 31 insertions(+), 1 deletion(-)
(struts) branch WW-4062-ognl-exc-cache deleted (was 6caa932ff)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch WW-4062-ognl-exc-cache in repository https://gitbox.apache.org/repos/asf/struts.git was 6caa932ff WW-4062 Cache OgnlException thrown on compilation The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
