Compare commits

..

14 Commits

Author SHA1 Message Date
4d1521eddd Merge pull request 'hotfix/1.2.2' (#39) from hotfix/1.2.2 into github/master
Reviewed-on: #39
2025-02-01 09:05:48 +01:00
david
7b57388299 docs: Update CHANGELOG.md 2025-02-01 09:04:45 +01:00
david
2333e597b1 docs: README.md: Fix GitHubs install.sh download link 2025-02-01 08:57:22 +01:00
david
d4461b07cc fix: install.sh: Fix GitHubs warp4j download link 2025-02-01 08:55:23 +01:00
david
7f3554690d fix: Submodules removed when Jdep collects necessary modules 2025-02-01 08:49:25 +01:00
c130b303d7 Merge pull request 'hotfix/transitive_dependency_detection_in_jdep' (#34) from hotfix/transitive_dependency_detection_in_jdep into github/master
Reviewed-on: #34
2025-01-17 11:40:32 +01:00
david
402a0bb21c docs: Update CHANGELOG.md 2025-01-17 11:38:56 +01:00
david
bbd8d9f60f fix: Improved transitive dependency detection for jdeps call 2025-01-17 11:37:33 +01:00
kirbylink
2e2d45ca29
Merge pull request #3 from kirbylink/feature/add_modules
Adding parameter to add additional modules to optimized JDK
2024-06-01 19:39:21 +02:00
2da8aed126 Adding parameter to add additional modules to optimized JDK 2024-06-01 19:35:07 +02:00
kirbylink
7488b681cf
Merge pull request #2 from kirbylink/feature_macos_improvement
Adding MacOs Application Bundle in tar.gz file
2024-05-31 21:45:22 +02:00
7c963cf2cd Adding MacOs Application Bundle in tar.gz file
Updating CHANGELOG.md, adding infos to README.md and improving help
2024-05-31 21:33:22 +02:00
kirbylink
d482794bca
Merge pull request #1 from kirbylink/merge_local_changes_into_master
Merge local changes into GitHub master
2024-05-20 21:42:16 +02:00
David
b6b0f56980 - Install script improved to run with /bin/sh
- Dockerfile changed to use install.sh script (Works on x64 and aarch64
architecture)
- Dockerfile_x64 with old build script for tests
- Script warp4j improved to support to run on aarch64 architecture

Cleaning up repository
Updating compatibility in README.md
2024-05-20 21:39:31 +02:00
7 changed files with 19 additions and 205 deletions

View File

@ -1,187 +0,0 @@
# Variables
tag: &tag latest
repo: &repo phoenix.ipv64.de/kirbylink/warp4j
branch: &branch master
dry_run: &dry_run false
step_name: &step_name warp4j
pipeline_name: &pipeline_name warp4j build and push
notification_name: &notification_name Send Notification
# Basic build options
x-step: &default_build_option
image: plugins/docker
settings:
dry_run: *dry_run
mirror: https://registry.phoenix.ipv64.de
repo: *repo
tags:
- *tag
x-step: &default_notification_option
image: phoenix.ipv64.de/kirbylink/drone-gotify:latest
settings:
gotifytoken:
from_secret: plugin_gotifytoken
gotifyendpoint:
from_secret: plugin_gotifyendpoint
gotifytitle: *step_name
gotifypriority: 5
kind: pipeline
type: docker
platform:
os: linux
arch: arm64
name: *pipeline_name
steps:
- name: *step_name
<<: *default_build_option
settings:
dockerfile: Dockerfile
- name: *notification_name
<<: *default_notification_option
settings:
message: >
{{#success build.status}}
Build of docker image on build {{build.number}} succeeded on {{repo.name}}. Build link: {{build.link}}
{{else}}
WARNING. Build of docker image on build {{build.number}} failed on {{repo.name}}. Build link: {{build.link}}
{{/success}}
when:
status: [ success, failure ]
trigger:
branch:
- *branch
event:
- push
- custom
---
# Variables
tag: &tag testing
repo: &repo phoenix.ipv64.de/kirbylink/warp4j
branch: &branch develop
dry_run: &dry_run false
step_name: &step_name warp4j
pipeline_name: &pipeline_name warp4j build and push (testing)
notification_name: &notification_name Send Notification
# Basic build options
x-step: &default_build_option
image: plugins/docker
settings:
dry_run: *dry_run
mirror: https://registry.phoenix.ipv64.de
repo: *repo
tags:
- *tag
x-step: &default_notification_option
image: phoenix.ipv64.de/kirbylink/drone-gotify:latest
settings:
gotifytoken:
from_secret: plugin_gotifytoken
gotifyendpoint:
from_secret: plugin_gotifyendpoint
gotifytitle: *step_name
gotifypriority: 5
kind: pipeline
type: docker
platform:
os: linux
arch: arm64
name: *pipeline_name
steps:
- name: *step_name
<<: *default_build_option
settings:
dockerfile: Dockerfile
- name: *notification_name
<<: *default_notification_option
settings:
message: >
{{#success build.status}}
Build of test docker image on build {{build.number}} succeeded on {{repo.name}}. Build link: {{build.link}}
{{else}}
WARNING. Build of docker image on build {{build.number}} failed on {{repo.name}}. Build link: {{build.link}}
{{/success}}
when:
status: [ success, failure ]
trigger:
branch:
- *branch
event:
- push
- custom
---
# Variables
tag: &tag testing
repo: &repo phoenix.ipv64.de/kirbylink/warp4j
dry_run: &dry_run true
step_name: &step_name warp4j
pipeline_name: &pipeline_name warp4j build only (testing)
notification_name: &notification_name Send Notification
# Basic build options
x-step: &default_build_option
image: plugins/docker
settings:
dry_run: *dry_run
mirror: https://registry.phoenix.ipv64.de
repo: *repo
tags:
- *tag
x-step: &default_notification_option
image: phoenix.ipv64.de/kirbylink/drone-gotify:latest
settings:
gotifytoken:
from_secret: plugin_gotifytoken
gotifyendpoint:
from_secret: plugin_gotifyendpoint
gotifytitle: *step_name
gotifypriority: 5
kind: pipeline
type: docker
platform:
os: linux
arch: arm64
name: *pipeline_name
steps:
- name: *step_name
<<: *default_build_option
settings:
dockerfile: Dockerfile
- name: warp4j x64
<<: *default_build_option
settings:
dockerfile: Dockerfile_x64
- name: *notification_name
<<: *default_notification_option
settings:
message: >
{{#success build.status}}
Test build of docker image on build {{build.number}} succeeded on {{repo.name}}. Build link: {{build.link}}
{{else}}
WARNING. Test build of docker image on build {{build.number}} failed on {{repo.name}}. Build link: {{build.link}}
{{/success}}
when:
status: [ success, failure ]
trigger:
event:
- pull_request

View File

@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [v1.2.2] - 2025-02-01 ## [v1.2.2] - 2025-02-01
### Fixed ### Fixed
- Submodules removed when Jdep collects necessary modules - Submodules removed when Jdep collects necessary modules
- install.sh: Fix GitHubs warp4j download link
## [v1.2.1] - 2025-01-17 ## [v1.2.1] - 2025-01-17
### Fixed ### Fixed
@ -35,10 +36,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [origin warp4j] - 2019-02-28 ## [origin warp4j] - 2019-02-28
- See origin repository: https://github.com/guziks/warp4j - See origin repository: https://github.com/guziks/warp4j
[unreleased]: https://git.phoenix.ipv64.de/public/warp4j/compare/master...HEAD [unreleased]: https://github.com/kirbylink/warp4j/compare/master...HEAD
[v1.2.2]: https://git.phoenix.ipv64.de/public/warp4j/compare/v1.2.1...v1.2.2 [v1.2.2]: https://github.com/kirbylink/warp4j/compare/v1.2.1...v1.2.2
[v1.2.1]: https://git.phoenix.ipv64.de/public/warp4j/compare/v1.2.0...v1.2.1 [v1.2.1]: https://github.com/kirbylink/warp4j/compare/v1.2.0...v1.2.1
[v1.2.0]: https://git.phoenix.ipv64.de/public/warp4j/compare/v1.1.0...v1.2.0 [v1.2.0]: https://github.com/kirbylink/warp4j/compare/v1.1.0...v1.2.0
[v1.1.0]: https://git.phoenix.ipv64.de/public/warp4j/compare/v1.0.0...v1.1.0 [v1.1.0]: https://github.com/kirbylink/warp4j/compare/v1.0.0...v1.1.0
[v1.0.0]: https://git.phoenix.ipv64.de/public/warp4j/compare/stable...v1.0.0 [v1.0.0]: https://github.com/kirbylink/warp4j/compare/stable...v1.0.0
[origin warp4j]: https://github.com/guziks/warp4j [origin warp4j]: https://github.com/guziks/warp4j

View File

@ -5,5 +5,5 @@ RUN apt-get update && apt-get install -y \
unzip \ unzip \
zip \ zip \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
RUN curl -s https://git.phoenix.ipv64.de/public/warp4j/raw/branch/master/install.sh | /bin/sh -s RUN curl -s https://github.com/kirbylink/warp4j/raw/branch/master/install.sh | /bin/sh -s
ENTRYPOINT [ "/usr/local/bin/warp4j" ] ENTRYPOINT [ "/usr/local/bin/warp4j" ]

View File

@ -7,7 +7,7 @@ RUN apt-get update && apt-get install -y \
zip \ zip \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
RUN curl -fsSL -o /tmp/warp-packer \ RUN curl -fsSL -o /tmp/warp-packer \
https://git.phoenix.ipv64.de/public/warp/releases/download/1.0.0/linux-x64.warp-packer \ https://github.com/kirbylink/warp/releases/download/1.0.0/linux-x64.warp-packer \
&& install -D \ && install -D \
--mode=755 \ --mode=755 \
--owner=root \ --owner=root \

View File

@ -5,17 +5,17 @@ Here are several more ways to install `warp4j`.
## Install script ## Install script
Run the [install.sh](./install.sh) script from source or use the following command: Run the [install.sh](./install.sh) script from source or use the following command:
```sh ```sh
curl -s https://git.phoenix.ipv64.de/public/warp4j/raw/branch/master/install.sh | /bin/sh -s curl -s https://github.com/kirbylink/warp4j/raw/branch/master/install.sh | /bin/sh -s
``` ```
## Manual ## Manual
First install [warp-packer](https://git.phoenix.ipv64.de/public/warp/releases) and ensure other common tools available: `awk`, `curl`, `file`, `grep`, `sed`, `sort`, `tar`, `unzip`, optional: `zip`. Then install `warp4j` like this: First install [warp-packer](https://github.com/kirbylink/warp/releases) and ensure other common tools available: `awk`, `curl`, `file`, `grep`, `sed`, `sort`, `tar`, `unzip`, optional: `zip`. Then install `warp4j` like this:
``` ```
$ LOCATION=/usr/local/bin \ $ LOCATION=/usr/local/bin \
LINK=https://git.phoenix.ipv64.de/public/warp4j/raw/branch/master/warp4j \ LINK=https://github.com/kirbylink/warp4j/raw/branch/master/warp4j \
TEMP_LOCATION=/tmp/warp4j \ TEMP_LOCATION=/tmp/warp4j \
bash -c 'curl -fsSL -o $TEMP_LOCATION $LINK && \ bash -c 'curl -fsSL -o $TEMP_LOCATION $LINK && \
sudo install -D \ sudo install -D \

View File

@ -19,8 +19,8 @@ Just put both `warp4j` and `warp-packer` somewhere in your PATH and run `warp4j
Curl one-liner installs the latest versions of both `warp4j` and `warp-packer`: Curl one-liner installs the latest versions of both `warp4j` and `warp-packer`:
```sh ```
bash -c "$(curl -fsSL https://git.phoenix.ipv64.de/public/warp4j/raw/branch/master/install.sh)" bash -c "$(curl -fsSL https://github.com/kirbylink/warp4j/raw/refs/heads/master/install.sh)"
``` ```
This script will show missing dependencies (if there are any); they must be installed with your package manager. This script will show missing dependencies (if there are any); they must be installed with your package manager.
@ -147,4 +147,4 @@ Downloaded runtimes and prepared bundles are here:
- Linux: `$HOME/.local/share/warp4j` - Linux: `$HOME/.local/share/warp4j`
- macOS: `$HOME/Library/Application Support/warp4j` - macOS: `$HOME/Library/Application Support/warp4j`
To override cache path, set `WARP4J_CACHE` environment variable. To override cache path, set `WARP4J_CACHE` environment variable.

View File

@ -16,9 +16,9 @@ MAC=macos
WIN=windows WIN=windows
# Urls # Urls
LIN_X64_URL=https://git.phoenix.ipv64.de/public/warp/releases/download/1.0.0/linux-x64.warp-packer LIN_X64_URL=https://github.com/kirbylink/warp/releases/download/1.0.0/linux-x64.warp-packer
LIN_AARCH64_URL=https://git.phoenix.ipv64.de/public/warp/releases/download/1.0.0/linux-aarch64.warp-packer LIN_AARCH64_URL=https://github.com/kirbylink/warp/releases/download/1.0.0/linux-aarch64.warp-packer
MAC_URL=https://git.phoenix.ipv64.de/public/warp/releases/download/1.0.0/macos-x64.warp-packer MAC_URL=https://github.com/kirbylink/warp/releases/download/1.0.0/macos-x64.warp-packer
# platform architecture # platform architecture
X64=x64 X64=x64
@ -128,7 +128,7 @@ get_missing_deps() {
fi fi
} }
WARP4J_LINK="https://git.phoenix.ipv64.de/public/warp4j/raw/branch/master/warp4j" WARP4J_LINK="https://github.com/kirbylink/warp4j/raw/refs/heads/master/warp4j"
echo "Getting information about warp-packer releases..." echo "Getting information about warp-packer releases..."
WARP_LINK=$(get_warp_link $THIS_PLATFORM $THIS_ARCHITECTURE) WARP_LINK=$(get_warp_link $THIS_PLATFORM $THIS_ARCHITECTURE)