8
0
Fork
You've already forked shell-server
0

Added JRE to package install list #81

Open
Tunas1337 wants to merge 1 commit from Tunas1337/master-jre into master
pull from: Tunas1337/master-jre
merge into: hashbang-sh:master
hashbang-sh:master
hashbang-sh:basic-https-support
hashbang-sh:fix-tab-syntax
hashbang-sh:fix-man-installation-path
hashbang-sh:remove-with-items
hashbang-sh:lxd
hashbang-sh:ansible/roles
hashbang-sh:pam-cleanup
hashbang-sh:packer
hashbang-sh:packer-ryan
Tunas1337 commented 2018年10月24日 14:01:32 +02:00 (Migrated from github.com)
Copy link
No description provided.
RyanSquared commented 2018年10月24日 19:34:17 +02:00 (Migrated from github.com)
Copy link

I believe we disabled the JRE due to issues with a forced? dependency on an x server; if this is no longer the case, we'll likely add it back in. Do note that Java applications that take more than half a GB of memory are not likely to run.

I believe we disabled the JRE due to issues with a forced? dependency on an x server; if this is no longer the case, we'll likely add it back in. Do note that Java applications that take more than half a GB of memory are not likely to run.
Tunas1337 commented 2018年10月24日 19:46:34 +02:00 (Migrated from github.com)
Copy link

I think that dependency is gone, but I'm unsure; also, please look into the CI failing due to keyservers (issue #82)

I think that dependency is gone, but I'm unsure; also, please look into the CI failing due to keyservers (issue #82)
RyanSquared commented 2018年10月25日 01:33:38 +02:00 (Migrated from github.com)
Copy link

restarting the CI job to see if it'll fix itself

restarting the CI job to see if it'll fix itself
This pull request has changes conflicting with the target branch.
  • ansible/tasks/packages/main.yml
View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin Tunas1337/master-jre:Tunas1337/master-jre
git switch Tunas1337/master-jre

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch master
git merge --no-ff Tunas1337/master-jre
git switch Tunas1337/master-jre
git rebase master
git switch master
git merge --ff-only Tunas1337/master-jre
git switch Tunas1337/master-jre
git rebase master
git switch master
git merge --no-ff Tunas1337/master-jre
git switch master
git merge --squash Tunas1337/master-jre
git switch master
git merge --ff-only Tunas1337/master-jre
git switch master
git merge Tunas1337/master-jre
git push origin master
Sign in to join this conversation.
No reviewers
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
hashbang-sh/shell-server!81
Reference in a new issue
hashbang-sh/shell-server
No description provided.
Delete branch "Tunas1337/master-jre"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?