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

Updates Eclipse version: 2024-12 -> 2025-03 #142

Merged
merged 3 commits into from
Mar 18, 2025
Merged

Updates Eclipse version: 2024-12 -> 2025-03 #142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2efdfc7
Updates Eclipse version: 2024-12 -> 2025-03
maxkratz Mar 12, 2025
373609e
Revert "Merge pull request #131 from eMoflon/hotfix/block-bad-apache-…
maxkratz Mar 12, 2025
a6d77aa
Merge branch 'main' into feature/update-eclipse-2025-03
maxkratz Mar 13, 2025
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
38 changes: 13 additions & 25 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ on:

env:
# Eclipse version to use in this CI
VERSION: "2024-12"
VERSION: "2025-03"
# emoflon-headless source URL (needed by macOS-based runner workaround)
EMOFLON_HEADLESS_SRC: "https://api.github.com/repos/eMoflon/emoflon-headless/releases/latest"
# import plugin URL
Expand Down Expand Up @@ -263,7 +263,7 @@ jobs:
run: echo "Started CI build (Eclipse eMoflon macOS user)."
- name: Install dependencies
run: |
brew install p7zip coreutils grep wget curl gsed
brew install p7zip coreutils grep wget curl
- name: Check out repository code
uses: actions/checkout@v4
- name: Download splash image
Expand All @@ -283,9 +283,7 @@ jobs:
with:
name: com.seeq.eclipse.importprojects.jar
- name: Run build script
run: |
export PATH="/opt/homebrew/opt/gnu-sed/libexec/gnubin:$PATH"
chmod +x build.sh && ./build.sh -m user -o macos
run: chmod +x build.sh && ./build.sh -m user -o macos
- name: Fix permissions
run: sudo xattr -cr ./eclipse/Eclipse.app
- name: Upload artifact
Expand All @@ -303,7 +301,7 @@ jobs:
run: echo "Started CI build (Eclipse eMoflon macOS dev)."
- name: Install dependencies
run: |
brew install p7zip coreutils grep wget curl gsed
brew install p7zip coreutils grep wget curl
- name: Check out repository code
uses: actions/checkout@v4
- name: Download splash image
Expand All @@ -323,9 +321,7 @@ jobs:
with:
name: com.seeq.eclipse.importprojects.jar
- name: Run build script
run: |
export PATH="/opt/homebrew/opt/gnu-sed/libexec/gnubin:$PATH"
chmod +x build.sh && ./build.sh -m dev -o macos
run: chmod +x build.sh && ./build.sh -m dev -o macos
- name: Fix permissions
run: sudo xattr -cr ./eclipse/Eclipse.app
- name: Upload artifact
Expand All @@ -343,7 +339,7 @@ jobs:
run: echo "Started CI build (Eclipse eMoflon macOS dev HiPE)."
- name: Install dependencies
run: |
brew install p7zip coreutils grep wget curl gsed
brew install p7zip coreutils grep wget curl
- name: Check out repository code
uses: actions/checkout@v4
- name: Download splash image
Expand All @@ -363,9 +359,7 @@ jobs:
with:
name: com.seeq.eclipse.importprojects.jar
- name: Run build script
run: |
export PATH="/opt/homebrew/opt/gnu-sed/libexec/gnubin:$PATH"
chmod +x build.sh && ./build.sh -m hipedev -o macos
run: chmod +x build.sh && ./build.sh -m hipedev -o macos
- name: Fix permissions
run: sudo xattr -cr ./eclipse/Eclipse.app
- name: Upload artifact
Expand All @@ -383,7 +377,7 @@ jobs:
run: echo "Started CI build (Eclipse eMoflon macOS user)."
- name: Install dependencies
run: |
brew install p7zip coreutils grep wget curl gsed
brew install p7zip coreutils grep wget curl
- name: Check out repository code
uses: actions/checkout@v4
- name: Download splash image
Expand All @@ -403,9 +397,7 @@ jobs:
with:
name: com.seeq.eclipse.importprojects.jar
- name: Run build script
run: |
export PATH="/opt/homebrew/opt/gnu-sed/libexec/gnubin:$PATH"
chmod +x build.sh && ./build.sh -m user -o macosarm
run: chmod +x build.sh && ./build.sh -m user -o macosarm
- name: Fix permissions
run: sudo xattr -cr ./eclipse/Eclipse.app
- name: Upload artifact
Expand All @@ -423,7 +415,7 @@ jobs:
run: echo "Started CI build (Eclipse eMoflon macOS dev)."
- name: Install dependencies
run: |
brew install p7zip coreutils grep wget curl gsed
brew install p7zip coreutils grep wget curl
- name: Check out repository code
uses: actions/checkout@v4
- name: Download splash image
Expand All @@ -443,9 +435,7 @@ jobs:
with:
name: com.seeq.eclipse.importprojects.jar
- name: Run build script
run: |
export PATH="/opt/homebrew/opt/gnu-sed/libexec/gnubin:$PATH"
chmod +x build.sh && ./build.sh -m dev -o macosarm
run: chmod +x build.sh && ./build.sh -m dev -o macosarm
- name: Fix permissions
run: sudo xattr -cr ./eclipse/Eclipse.app
- name: Upload artifact
Expand All @@ -463,7 +453,7 @@ jobs:
run: echo "Started CI build (Eclipse eMoflon macOS dev HiPE)."
- name: Install dependencies
run: |
brew install p7zip coreutils grep wget curl gsed
brew install p7zip coreutils grep wget curl
- name: Check out repository code
uses: actions/checkout@v4
- name: Download splash image
Expand All @@ -483,9 +473,7 @@ jobs:
with:
name: com.seeq.eclipse.importprojects.jar
- name: Run build script
run: |
export PATH="/opt/homebrew/opt/gnu-sed/libexec/gnubin:$PATH"
chmod +x build.sh && ./build.sh -m hipedev -o macosarm
run: chmod +x build.sh && ./build.sh -m hipedev -o macosarm
- name: Fix permissions
run: sudo xattr -cr ./eclipse/Eclipse.app
- name: Upload artifact
Expand Down
32 changes: 0 additions & 32 deletions build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,29 +199,6 @@ remove_update_sites () {
rm -rf $UPDATE_SITE_CONFIG_PATH/$UPDATE_SITE_METADATA
}

# Removes broken org.apache.commons.logging JAR from plug-ins
remove_broken_commons_logging () {
log "Removes broken org.apache.commons.logging JAR from plug-ins."
rm $ECLIPSE_BASE_PATH/plugins/org.apache.commons.logging_1.2.0.v20180409-1502.jar
# force org.eclipse.equinox to take correct JAR into account
# org.apache.commons.logging,1.2.0,plugins/org.apache.commons.logging_1.2.0.jar,4,false
sed -i '/org.apache.commons.lang3/a org.apache.commons.logging,1.2.0,plugins/org.apache.commons.logging_1.2.0.jar,4,false' $ECLIPSE_BASE_PATH/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info
# org.apache.commons.logging,1.2.0.v20180409-1502,plugins/org.apache.commons.logging_1.2.0.v20180409-1502.jar,4,false
sed -i '/org.apache.commons.logging,1.2.0.v20180409-1502,plugins\/org.apache.commons.logging_1.2.0.v20180409-1502.jar,4,false/d' $ECLIPSE_BASE_PATH/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info
}

# Copies the non-broken org.apache.commons.logging JAR from plug-ins
save_non_broken_commons_logging () {
log "Save non-broken org.apache.commons.logging JAR from plug-ins."
cp $ECLIPSE_BASE_PATH/plugins/org.apache.commons.logging_1.2.0.jar /tmp/org.apache.commons.logging_1.2.0.jar
}

# Restores the non-broken org.apache.commons.logging JAR to plug-ins
restore_non_broken_commons_logging () {
log "Restores the non-broken org.apache.commons.logging JAR from plug-ins."
cp /tmp/org.apache.commons.logging_1.2.0.jar $ECLIPSE_BASE_PATH/plugins/org.apache.commons.logging_1.2.0.jar
rm /tmp/org.apache.commons.logging_1.2.0.jar
}

#
# Script
Expand Down Expand Up @@ -270,9 +247,6 @@ fi
# Install global Eclipse settings from config file
install_global_eclipse_settings

# Save non-broken org.apache.commons.logging JAR from plug-ins
save_non_broken_commons_logging

log "Install Eclipse plug-ins."
for p in ${ORDER[@]}; do
# Check if eMoflon packages must be skipped (for dev builds).
Expand Down Expand Up @@ -317,12 +291,6 @@ else
chmod +x splash.sh && ./splash.sh deploy $VERSION $ECLIPSE_BASE_PATH
fi

# Remove broken org.apache.commons.logging JAR
remove_broken_commons_logging

# Restore non-broken org.apache.commons.logging JAR
restore_non_broken_commons_logging

log "Clean-up old archives and create new archive."
rm -f ./$OUTPUT_FILE
zip -q -r $OUTPUT_FILE eclipse
Expand Down
Loading