Skip to content

Commit

Permalink
Merge remote-tracking branch 'ibex/main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
maxkratz committed Jan 9, 2023
2 parents 9306f73 + bff3d16 commit d1dff8b
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 1 deletion.
13 changes: 13 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -164,9 +164,22 @@ jobs:
steps:
- name: Start message
run: echo "Started CI build (Eclipse eMoflon macOS user)."
# `brew install xy` when run after `brew update` triggers
# upgrade of python which fails unless conflicting symlinks are deleted.
# See: https://github.com/actions/setup-python/issues/577
- name: Install dependencies
run: |
brew update
rm '/usr/local/bin/2to3'
rm '/usr/local/bin/idle3'
rm '/usr/local/bin/pydoc3'
rm '/usr/local/bin/python3'
rm '/usr/local/bin/python3-config'
rm '/usr/local/bin/2to3-3.11'
rm '/usr/local/bin/idle3.11'
rm '/usr/local/bin/pydoc3.11'
rm '/usr/local/bin/python3.11'
rm '/usr/local/bin/python3.11-config'
brew install p7zip coreutils grep wget curl
- name: Check out repository code
uses: actions/checkout@v3
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ This repository is used to automatically build an Eclipse [eMoflon::Neo](https:/
**Additional packages** are installed for every non-CI build.
Currently, the list of additional packages includes:
- [EclEmma](https://www.eclemma.org/)
- [PMD](https://pmd.github.io/latest/index.html)
- [Checkstyle](https://checkstyle.org/eclipse-cs/#!/)
- [SpotBugs](https://spotbugs.github.io/https://spotbugs.github.io/)

Expand Down
2 changes: 1 addition & 1 deletion build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ OUTPUT_FILE_PREFIX_LINUX="eclipse-emoflon-linux"
OUTPUT_FILE_PREFIX_WINDOWS="eclipse-emoflon-windows"
OUTOUT_FILE_PREFIX_MACOS="eclipse-emoflon-macos"
MIRROR="https://ftp.fau.de"
UPDATESITES="https://download.eclipse.org/modeling/tmf/xtext/updates/composite/releases/,https://hallvard.github.io/plantuml/,https://www.kermeta.org/k2/update,https://www.genuitec.com/updates/devstyle/ci/,https://download.eclipse.org/releases/$VERSION,https://www.codetogether.com/updates/ci/,http://update.eclemma.org/,https://checkstyle.org/eclipse-cs-update-site/,https://spotbugs.github.io/eclipse/,https://emoflon.org/emoflon-neo-updatesite/snapshot/"
UPDATESITES="https://download.eclipse.org/modeling/tmf/xtext/updates/composite/releases/,https://hallvard.github.io/plantuml/,https://www.kermeta.org/k2/update,https://www.genuitec.com/updates/devstyle/ci/,https://download.eclipse.org/releases/$VERSION,https://www.codetogether.com/updates/ci/,http://update.eclemma.org/,https://pmd.github.io/pmd-eclipse-plugin-p2-site/,https://checkstyle.org/eclipse-cs-update-site/,https://spotbugs.github.io/eclipse/,https://emoflon.org/emoflon-neo-updatesite/snapshot/"
EMOFLON_HEADLESS_SRC="https://api.github.com/repos/eMoflon/emoflon-headless/releases/latest"

# Import plug-in:
Expand Down
1 change: 1 addition & 0 deletions packages/additional-packages.list
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
org.eclipse.eclemma.feature.feature.group
net.sourceforge.pmd.eclipse.feature.group
net.sf.eclipsecs.feature.group
com.github.spotbugs.plugin.eclipse.feature.group

0 comments on commit d1dff8b

Please sign in to comment.