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

Java module #303

Merged
merged 14 commits into from
Apr 4, 2024
Merged

Java module #303

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
626da97
add java classfiles
Chang-CH Apr 2, 2024
b241e03
add java packages submodule
Chang-CH Apr 3, 2024
7b6fa4b
remove old folder
Chang-CH Apr 3, 2024
7fd77c0
include module
Chang-CH Apr 3, 2024
b8a5764
use checkout submodules
Chang-CH Apr 3, 2024
60edf43
checkout submodules in PR
Chang-CH Apr 3, 2024
4081a3f
commit submodule
Chang-CH Apr 3, 2024
3e6d014
update submodule
Chang-CH Apr 3, 2024
7f7a98f
move java-packages
Chang-CH Apr 3, 2024
c7f7a7e
update submodule
Chang-CH Apr 3, 2024
ed46c93
bump submodule
Chang-CH Apr 3, 2024
bab4619
fix copy command
Chang-CH Apr 3, 2024
ce842e9
update submodules
Chang-CH Apr 4, 2024
7f823ee
Merge branch 'master' into java-module
martin-henz Apr 4, 2024
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
6 changes: 6 additions & 0 deletions .github/workflows/pages-deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ jobs:
steps:
- name: Checkout 🛎️
uses: actions/checkout@v4
with:
submodules: recursive

- name: Use Node.js 💻
uses: actions/setup-node@v4
Expand All @@ -28,6 +30,10 @@ jobs:

- name: Build Modules 🔧
run: yarn build --tsc --lint


- name: include java json
run: cp -r src/java-packages build

- name: Deploy 🚀
uses: peaceiris/actions-gh-pages@v3
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/pull-request.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@ jobs:
steps:
- name: Check out source code
uses: actions/checkout@v4

with:
submodules: recursive

- name: Use Node.js 💻
uses: actions/setup-node@v4
with:
Expand Down
6 changes: 6 additions & 0 deletions .gitmodules
View file
Open in desktop
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is the same submodule updated in two paths?

Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[submodule "src/java/java-packages"]
path = src/java/java-packages
url = https://github.com/source-academy/java-packages
[submodule "src/java-packages"]
path = src/java-packages
url = https://github.com/source-academy/java-packages
1 change: 1 addition & 0 deletions src/java-packages
Open in desktop
Submodule java-packages added at db850e
Loading