Skip to content

Commit 183748d

Browse files
MSt-10MSt-10
committed
Merge branch 'main' into action_extensions
2 parents b3f8e51 + 867b4a0 commit 183748d

File tree

60 files changed

+188
-1035
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+188
-1035
lines changed

‎action.yml‎

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,28 @@ runs:
6868
echo "GIT_INFO_FILE=$GIT_INFO_FILE" >> $GITHUB_ENV
6969
7070
gather_git_info() {
71-
echo "| Attribute | Value |"
72-
echo "| -------------- | ----- |"
73-
echo "| Repository URL | $(git config --get remote.origin.url) |"
74-
echo "| Branch | $(git branch --show-current) |"
75-
echo "| Commit | $(git log -1 --pretty=format:"%H") |"
71+
REPO_URL=$(git config --get remote.origin.url)
72+
BRANCH=$(git branch --show-current)
73+
COMMIT=$(git log -1 --pretty=format:"%H")
74+
75+
REPO_PATH=$(echo $REPO_URL | sed -E 's/.*github\.com[:\/](.*)/\1/')
76+
OWNER=$(echo $REPO_PATH | cut -d'/' -f1)
77+
REPO_NAME=$(echo $REPO_PATH | cut -d'/' -f2 | sed 's/\.git$//')
78+
API_URL="https://api.github.com/repos/$OWNER/$REPO_NAME"
79+
80+
# Get the number of commits using GitHub API and pagination info
81+
NUM_COMMITS=$(curl -s -I "${API_URL}/commits?per_page=1" | grep -i 'link:' | sed -E 's/.*page=([0-9]+)>; rel="last".*/\1/')
82+
NUM_STARS=$(curl -s $API_URL | jq '.stargazers_count // 0')
83+
NUM_CONTRIBUTORS=$(curl -s $API_URL/contributors | jq 'length // 0')
84+
85+
echo "| Attribute | Value |"
86+
echo "| ----------------- | ----- |"
87+
echo "| Repository URL | $REPO_URL |"
88+
echo "| Branch | $BRANCH |"
89+
echo "| Commit | $COMMIT |"
90+
echo "| Number of Commits | $NUM_COMMITS |"
91+
echo "| Stars | $NUM_STARS |"
92+
echo "| Contributors | $NUM_CONTRIBUTORS |"
7693
echo ""
7794
}
7895

‎bundles/org.palladiosimulator.retriever.core/META-INF/MANIFEST.MF‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ Require-Bundle: org.eclipse.jdt.core,
1414
org.palladiosimulator.generator.fluent,
1515
org.palladiosimulator.somox.ast2seff,
1616
org.palladiosimulator.retriever.mocore,
17-
org.palladiosimulator.view.plantuml.generator
17+
org.palladiosimulator.view.plantuml.generator,
18+
org.palladiosimulator.retriever.services
1819
Export-Package: org.palladiosimulator.retriever.core.cli;uses:="org.eclipse.equinox.app",
1920
org.palladiosimulator.retriever.core.configuration,
2021
org.palladiosimulator.retriever.core.main,

‎bundles/org.palladiosimulator.retriever.core/plugin.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
<extension
4242
id="org.palladiosimulator.retriever.core.service.performance_analyst"
4343
name="Performance Analyst"
44-
point="org.palladiosimulator.retriever.extraction.analyst">
44+
point="org.palladiosimulator.retriever.services.analyst">
4545
<analyst
4646
class="org.palladiosimulator.retriever.core.service.PerformanceAnalyst">
4747
</analyst>

‎bundles/org.palladiosimulator.retriever.core/src/org/palladiosimulator/retriever/core/cli/RetrieverApplication.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@
2222
import org.palladiosimulator.retriever.core.service.DiscovererCollection;
2323
import org.palladiosimulator.retriever.core.service.RuleCollection;
2424
import org.palladiosimulator.retriever.core.workflow.RetrieverJob;
25-
import org.palladiosimulator.retriever.extraction.engine.Analyst;
26-
import org.palladiosimulator.retriever.extraction.engine.Discoverer;
27-
import org.palladiosimulator.retriever.extraction.engine.RetrieverConfiguration;
28-
import org.palladiosimulator.retriever.extraction.engine.Rule;
29-
import org.palladiosimulator.retriever.extraction.engine.ServiceConfiguration;
25+
import org.palladiosimulator.retriever.services.Analyst;
26+
import org.palladiosimulator.retriever.services.Discoverer;
27+
import org.palladiosimulator.retriever.services.RetrieverConfiguration;
28+
import org.palladiosimulator.retriever.services.Rule;
29+
import org.palladiosimulator.retriever.services.ServiceConfiguration;
3030

3131
public class RetrieverApplication implements IApplication {
3232

‎bundles/org.palladiosimulator.retriever.core/src/org/palladiosimulator/retriever/core/configuration/RetrieverBlackboardKeys.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.palladiosimulator.retriever.core.configuration;
22

3-
import org.palladiosimulator.retriever.extraction.blackboard.RetrieverBlackboard;
3+
import org.palladiosimulator.retriever.services.blackboard.RetrieverBlackboard;
44

55
public final class RetrieverBlackboardKeys {
66
private static final String CONFIG_PREFIX = "org.palladiosimulator.retriever.core.configuration.";

‎bundles/org.palladiosimulator.retriever.core/src/org/palladiosimulator/retriever/core/configuration/RetrieverConfigurationImpl.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@
1111
import org.palladiosimulator.retriever.core.service.DiscovererCollection;
1212
import org.palladiosimulator.retriever.core.service.EmptyCollection;
1313
import org.palladiosimulator.retriever.core.service.RuleCollection;
14-
import org.palladiosimulator.retriever.extraction.engine.Analyst;
15-
import org.palladiosimulator.retriever.extraction.engine.Discoverer;
16-
import org.palladiosimulator.retriever.extraction.engine.RetrieverConfiguration;
17-
import org.palladiosimulator.retriever.extraction.engine.Rule;
18-
import org.palladiosimulator.retriever.extraction.engine.Service;
19-
import org.palladiosimulator.retriever.extraction.engine.ServiceCollection;
20-
import org.palladiosimulator.retriever.extraction.engine.ServiceConfiguration;
14+
import org.palladiosimulator.retriever.services.Analyst;
15+
import org.palladiosimulator.retriever.services.Discoverer;
16+
import org.palladiosimulator.retriever.services.RetrieverConfiguration;
17+
import org.palladiosimulator.retriever.services.Rule;
18+
import org.palladiosimulator.retriever.services.Service;
19+
import org.palladiosimulator.retriever.services.ServiceCollection;
20+
import org.palladiosimulator.retriever.services.ServiceConfiguration;
2121

2222
import de.uka.ipd.sdq.workflow.configuration.AbstractComposedJobConfiguration;
2323

‎bundles/org.palladiosimulator.retriever.core/src/org/palladiosimulator/retriever/core/configuration/RetrieverWorkflowConfiguration.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.palladiosimulator.retriever.core.configuration;
22

3-
import org.palladiosimulator.retriever.extraction.engine.RetrieverConfiguration;
3+
import org.palladiosimulator.retriever.services.RetrieverConfiguration;
44

55
import de.uka.ipd.sdq.workflow.launchconfig.AbstractWorkflowBasedRunConfiguration;
66

‎bundles/org.palladiosimulator.retriever.core/src/org/palladiosimulator/retriever/core/gui/RetrieverTab.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@
2222
import org.palladiosimulator.retriever.core.service.DiscovererCollection;
2323
import org.palladiosimulator.retriever.core.service.EmptyCollection;
2424
import org.palladiosimulator.retriever.core.service.RuleCollection;
25-
import org.palladiosimulator.retriever.extraction.engine.Analyst;
26-
import org.palladiosimulator.retriever.extraction.engine.Discoverer;
27-
import org.palladiosimulator.retriever.extraction.engine.Rule;
28-
import org.palladiosimulator.retriever.extraction.engine.ServiceCollection;
29-
import org.palladiosimulator.retriever.extraction.engine.ServiceConfiguration;
25+
import org.palladiosimulator.retriever.services.Analyst;
26+
import org.palladiosimulator.retriever.services.Discoverer;
27+
import org.palladiosimulator.retriever.services.Rule;
28+
import org.palladiosimulator.retriever.services.ServiceCollection;
29+
import org.palladiosimulator.retriever.services.ServiceConfiguration;
3030

3131
import de.uka.ipd.sdq.workflow.launchconfig.ImageRegistryHelper;
3232
import de.uka.ipd.sdq.workflow.launchconfig.LaunchConfigPlugin;

‎bundles/org.palladiosimulator.retriever.core/src/org/palladiosimulator/retriever/core/gui/ServiceConfigurationManager.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
import org.eclipse.core.runtime.IStatus;
77
import org.eclipse.debug.core.ILaunchConfiguration;
88
import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
9-
import org.palladiosimulator.retriever.extraction.engine.Service;
10-
import org.palladiosimulator.retriever.extraction.engine.ServiceConfiguration;
9+
import org.palladiosimulator.retriever.services.Service;
10+
import org.palladiosimulator.retriever.services.ServiceConfiguration;
1111

1212
import de.uka.ipd.sdq.workflow.launchconfig.LaunchConfigPlugin;
1313

‎bundles/org.palladiosimulator.retriever.core/src/org/palladiosimulator/retriever/core/gui/ServiceConfigurationView.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
import org.eclipse.swt.widgets.Tree;
2020
import org.eclipse.swt.widgets.TreeColumn;
2121
import org.eclipse.swt.widgets.TreeItem;
22-
import org.palladiosimulator.retriever.extraction.engine.Service;
23-
import org.palladiosimulator.retriever.extraction.engine.ServiceConfiguration;
22+
import org.palladiosimulator.retriever.services.Service;
23+
import org.palladiosimulator.retriever.services.ServiceConfiguration;
2424

2525
public class ServiceConfigurationView<T extends Service> extends ServiceConfigurationManager<T> {
2626
private static final int SERVICE_CONFIGURATION_VALUE_COLUMN = 1;

0 commit comments

Comments
 (0)