Skip to content

Commit

Permalink
Merge pull request #86 from asebak/feature/build
Browse files Browse the repository at this point in the history
Feature/build
  • Loading branch information
asebak authored Mar 26, 2022
2 parents 98cdc0f + 8a8dd11 commit 58fd17d
Show file tree
Hide file tree
Showing 61 changed files with 217 additions and 167 deletions.
49 changes: 49 additions & 0 deletions .github/workflows/build-plugin.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
name: Generate changelog and plugin archive for new release
on:
push:
tags:
- '*'
jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set up JDK 11
uses: actions/setup-java@v1
with:
java-version: 11
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Build with Gradle
run: ./gradlew buildPlugin
- name: Get the version
id: get_version
run: echo ::set-output name=VERSION::${GITHUB_REF#refs/tags/}
- name: Simple conventional changelog
uses: lstocchi/[email protected]
id: changelog
with:
token: ${{ secrets.GITHUB_TOKEN }}
current-tag: ${{ steps.get_version.outputs.VERSION }}
types-mapping: 'feat:Features,fix:Bug Fixes,docs:Documentation,refactor:Refactoring,build:Builds,chore:Other'
scopes-mapping: 'UI:UI,Hub:Hub'
- run: |
echo '${{ steps.changelog.outputs.changelog }}'
- name: Create Release
id: create_release
uses: actions/create-release@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
tag_name: ${{ steps.get_version.outputs.VERSION }}
release_name: ${{ steps.get_version.outputs.VERSION }}
body: ${{ steps.changelog.outputs.changelog }}
- name: Attach zip to release
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.create_release.outputs.upload_url }}
asset_path: '${{ github.workspace }}/build/distributions/com.blocklatency.intellij.embeddedlinux-jvmdebugger-${{ steps.get_version.outputs.VERSION }}.zip'
asset_name: 'Embeddedlinux-jvmdebug-${{ steps.get_version.outputs.VERSION }}.zip'
asset_content_type: application/zip
7 changes: 6 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ plugins {
id "java"
}

group 'com.atsebak'
group 'com.blocklatency'
version '1.24'


Expand Down Expand Up @@ -34,6 +34,7 @@ dependencies {
}

def intellijVersion = System.getenv().getOrDefault("IDEA_VERSION", "213.7172.25")
def jetBrainsToken = System.getenv().getOrDefault("JB_TOKEN", "")

intellij {
version = intellijVersion
Expand All @@ -42,6 +43,10 @@ intellij {
plugins = ['java']
}

publishPlugin {
token = jetBrainsToken
}

jar {
from('Resources') {
include 'pi.png'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
package com.atsebak.embeddedlinuxjvm.commandline;

import com.atsebak.embeddedlinuxjvm.console.EmbeddedLinuxJVMConsoleView;
import com.atsebak.embeddedlinuxjvm.console.EmbeddedLinuxJVMOutputForwarder;
import com.atsebak.embeddedlinuxjvm.deploy.DeploymentTarget;
import com.atsebak.embeddedlinuxjvm.localization.EmbeddedLinuxJVMBundle;
import com.atsebak.embeddedlinuxjvm.protocol.ssh.SSHHandlerTarget;
import com.atsebak.embeddedlinuxjvm.protocol.ssh.jsch.EmbeddedSSHClient;
import com.atsebak.embeddedlinuxjvm.runner.conf.EmbeddedLinuxJVMRunConfiguration;
import com.atsebak.embeddedlinuxjvm.runner.data.EmbeddedLinuxJVMRunConfigurationRunnerParameters;
import com.atsebak.embeddedlinuxjvm.services.ClasspathService;
import com.atsebak.embeddedlinuxjvm.utils.FileUtilities;
import com.atsebak.embeddedlinuxjvm.utils.RemoteCommandLineBuilder;
package com.blocklatency.embeddedlinuxjvm.commandline;

import com.blocklatency.embeddedlinuxjvm.console.EmbeddedLinuxJVMConsoleView;
import com.blocklatency.embeddedlinuxjvm.console.EmbeddedLinuxJVMOutputForwarder;
import com.blocklatency.embeddedlinuxjvm.deploy.DeploymentTarget;
import com.blocklatency.embeddedlinuxjvm.localization.EmbeddedLinuxJVMBundle;
import com.blocklatency.embeddedlinuxjvm.protocol.ssh.SSHHandlerTarget;
import com.blocklatency.embeddedlinuxjvm.protocol.ssh.jsch.EmbeddedSSHClient;
import com.blocklatency.embeddedlinuxjvm.runner.conf.EmbeddedLinuxJVMRunConfiguration;
import com.blocklatency.embeddedlinuxjvm.runner.data.EmbeddedLinuxJVMRunConfigurationRunnerParameters;
import com.blocklatency.embeddedlinuxjvm.services.ClasspathService;
import com.blocklatency.embeddedlinuxjvm.utils.FileUtilities;
import com.blocklatency.embeddedlinuxjvm.utils.RemoteCommandLineBuilder;
import com.intellij.debugger.DebuggerManagerEx;
import com.intellij.debugger.engine.DebugProcessImpl;
import com.intellij.debugger.impl.DebuggerSession;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.atsebak.embeddedlinuxjvm.commandline;
package com.blocklatency.embeddedlinuxjvm.commandline;

import com.atsebak.embeddedlinuxjvm.runner.conf.EmbeddedLinuxJVMRunConfiguration;
import com.blocklatency.embeddedlinuxjvm.runner.conf.EmbeddedLinuxJVMRunConfiguration;
import com.intellij.execution.configurations.JavaParameters;
import lombok.Builder;
import org.apache.commons.lang.StringUtils;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.atsebak.embeddedlinuxjvm.commandline;
package com.blocklatency.embeddedlinuxjvm.commandline;


import com.atsebak.embeddedlinuxjvm.console.EmbeddedLinuxJVMConsoleView;
import com.atsebak.embeddedlinuxjvm.localization.EmbeddedLinuxJVMBundle;
import com.atsebak.embeddedlinuxjvm.runner.conf.EmbeddedLinuxJVMConfigurationType;
import com.blocklatency.embeddedlinuxjvm.console.EmbeddedLinuxJVMConsoleView;
import com.blocklatency.embeddedlinuxjvm.localization.EmbeddedLinuxJVMBundle;
import com.blocklatency.embeddedlinuxjvm.runner.conf.EmbeddedLinuxJVMConfigurationType;
import com.intellij.execution.ExecutionManager;
import com.intellij.execution.RunManager;
import com.intellij.execution.RunnerAndConfigurationSettings;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.atsebak.embeddedlinuxjvm.commandline;
package com.blocklatency.embeddedlinuxjvm.commandline;

import lombok.Builder;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.atsebak.embeddedlinuxjvm.console;
package com.blocklatency.embeddedlinuxjvm.console;

import com.intellij.codeEditor.printing.PrintAction;
import com.intellij.execution.impl.ConsoleViewImpl;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.atsebak.embeddedlinuxjvm.console;
package com.blocklatency.embeddedlinuxjvm.console;

import com.google.common.io.Closeables;
import com.intellij.execution.ui.ConsoleViewContentType;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.atsebak.embeddedlinuxjvm.console;
package com.blocklatency.embeddedlinuxjvm.console;

import com.intellij.openapi.project.DumbAware;
import com.intellij.openapi.project.Project;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.atsebak.embeddedlinuxjvm.deploy;
package com.blocklatency.embeddedlinuxjvm.deploy;

import lombok.Builder;
import lombok.Getter;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.atsebak.embeddedlinuxjvm.deploy;
package com.blocklatency.embeddedlinuxjvm.deploy;

import com.atsebak.embeddedlinuxjvm.protocol.ssh.SSHHandlerTarget;
import com.blocklatency.embeddedlinuxjvm.protocol.ssh.SSHHandlerTarget;
import com.intellij.execution.configurations.RuntimeConfigurationException;
import lombok.Builder;
import org.jetbrains.annotations.NotNull;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.atsebak.embeddedlinuxjvm.hal;
package com.blocklatency.embeddedlinuxjvm.hal;

public interface HostMachineHAL {
String getCommandLineName();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.atsebak.embeddedlinuxjvm.hal;
package com.blocklatency.embeddedlinuxjvm.hal;


public class LinuxHAL implements HostMachineHAL {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.atsebak.embeddedlinuxjvm.hal;
package com.blocklatency.embeddedlinuxjvm.hal;

public class MacHAL implements HostMachineHAL {
@Override
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.atsebak.embeddedlinuxjvm.hal;
package com.blocklatency.embeddedlinuxjvm.hal;


public class WindowsHAL implements HostMachineHAL {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.atsebak.embeddedlinuxjvm.localization;
package com.blocklatency.embeddedlinuxjvm.localization;

import com.intellij.BundleBase;
import org.jetbrains.annotations.NonNls;
Expand All @@ -30,7 +30,7 @@
public final class EmbeddedLinuxJVMBundle {

@NonNls
private static final String BUNDLE = "com.atsebak.embeddedlinuxjvm.localization.EmbeddedLinuxJVMBundle";
private static final String BUNDLE = "com.blocklatency.embeddedlinuxjvm.localization.EmbeddedLinuxJVMBundle";
private static Reference<ResourceBundle> ourBundle;

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
package com.atsebak.embeddedlinuxjvm.project;

import com.atsebak.embeddedlinuxjvm.localization.EmbeddedLinuxJVMBundle;
import com.atsebak.embeddedlinuxjvm.ui.EmbeddedJavaModuleStep;
import com.atsebak.embeddedlinuxjvm.utils.FileUtilities;
import com.atsebak.embeddedlinuxjvm.utils.ProjectUtils;
import com.atsebak.embeddedlinuxjvm.utils.Template;
import com.google.common.io.Files;
package com.blocklatency.embeddedlinuxjvm.project;

import com.blocklatency.embeddedlinuxjvm.localization.EmbeddedLinuxJVMBundle;
import com.blocklatency.embeddedlinuxjvm.ui.EmbeddedJavaModuleStep;
import com.blocklatency.embeddedlinuxjvm.utils.FileUtilities;
import com.blocklatency.embeddedlinuxjvm.utils.ProjectUtils;
import com.blocklatency.embeddedlinuxjvm.utils.Template;
import com.intellij.ide.util.projectWizard.JavaModuleBuilder;
import com.intellij.ide.util.projectWizard.ModuleWizardStep;
import com.intellij.ide.util.projectWizard.WizardContext;
Expand Down Expand Up @@ -33,7 +32,6 @@
import com.intellij.openapi.vfs.VfsUtil;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.openapi.vfs.VirtualFileManager;
import com.intellij.testFramework.PsiTestUtil;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
Expand All @@ -50,7 +48,6 @@
import java.util.List;
import java.util.Objects;
import java.util.regex.Pattern;
import java.util.stream.Collectors;

@Getter
@Setter
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.atsebak.embeddedlinuxjvm.protocol.ssh;
package com.blocklatency.embeddedlinuxjvm.protocol.ssh;

import com.atsebak.embeddedlinuxjvm.protocol.ssh.jsch.EmbeddedSSHClient;
import com.blocklatency.embeddedlinuxjvm.protocol.ssh.jsch.EmbeddedSSHClient;
import com.jcraft.jsch.Session;
import lombok.AllArgsConstructor;
import lombok.Builder;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package com.atsebak.embeddedlinuxjvm.protocol.ssh;
package com.blocklatency.embeddedlinuxjvm.protocol.ssh;

import com.atsebak.embeddedlinuxjvm.commandline.JavaStatusChecker;
import com.atsebak.embeddedlinuxjvm.commandline.LinuxCommand;
import com.atsebak.embeddedlinuxjvm.console.EmbeddedLinuxJVMConsoleView;
import com.atsebak.embeddedlinuxjvm.localization.EmbeddedLinuxJVMBundle;
import com.atsebak.embeddedlinuxjvm.protocol.ssh.jsch.EmbeddedSSHClient;
import com.atsebak.embeddedlinuxjvm.protocol.ssh.jsch.SFTPHandler;
import com.atsebak.embeddedlinuxjvm.runner.data.EmbeddedLinuxJVMRunConfigurationRunnerParameters;
import com.atsebak.embeddedlinuxjvm.utils.FileUtilities;
import com.blocklatency.embeddedlinuxjvm.commandline.JavaStatusChecker;
import com.blocklatency.embeddedlinuxjvm.commandline.LinuxCommand;
import com.blocklatency.embeddedlinuxjvm.console.EmbeddedLinuxJVMConsoleView;
import com.blocklatency.embeddedlinuxjvm.localization.EmbeddedLinuxJVMBundle;
import com.blocklatency.embeddedlinuxjvm.protocol.ssh.jsch.EmbeddedSSHClient;
import com.blocklatency.embeddedlinuxjvm.protocol.ssh.jsch.SFTPHandler;
import com.blocklatency.embeddedlinuxjvm.runner.data.EmbeddedLinuxJVMRunConfigurationRunnerParameters;
import com.blocklatency.embeddedlinuxjvm.utils.FileUtilities;
import com.intellij.execution.configurations.RuntimeConfigurationException;
import com.intellij.execution.ui.ConsoleViewContentType;
import com.intellij.notification.Notification;
Expand Down Expand Up @@ -184,7 +184,7 @@ private Session connect(Session session) {
*/
private void setErrorOnUI(@NotNull final String message) {
final Notification notification = new Notification(
com.atsebak.embeddedlinuxjvm.utils.Notifications.GROUPDISPLAY_ID,
com.blocklatency.embeddedlinuxjvm.utils.Notifications.GROUPDISPLAY_ID,
EmbeddedLinuxJVMBundle.getString("pi.ssh.connection.error"), message,
NotificationType.INFORMATION);
Notifications.Bus.notify(notification);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.atsebak.embeddedlinuxjvm.protocol.ssh.jsch;
package com.blocklatency.embeddedlinuxjvm.protocol.ssh.jsch;


import com.jcraft.jsch.JSch;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.atsebak.embeddedlinuxjvm.protocol.ssh.jsch;
package com.blocklatency.embeddedlinuxjvm.protocol.ssh.jsch;


import com.jcraft.jsch.UserInfo;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.atsebak.embeddedlinuxjvm.protocol.ssh.jsch;
package com.blocklatency.embeddedlinuxjvm.protocol.ssh.jsch;

import com.jcraft.jsch.UIKeyboardInteractive;
import com.jcraft.jsch.UserInfo;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.atsebak.embeddedlinuxjvm.protocol.ssh.jsch;
package com.blocklatency.embeddedlinuxjvm.protocol.ssh.jsch;


import com.atsebak.embeddedlinuxjvm.console.EmbeddedLinuxJVMConsoleView;
import com.blocklatency.embeddedlinuxjvm.console.EmbeddedLinuxJVMConsoleView;
import com.jcraft.jsch.*;
import lombok.AllArgsConstructor;
import lombok.NoArgsConstructor;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.atsebak.embeddedlinuxjvm.protocol.ssh.jsch;
package com.blocklatency.embeddedlinuxjvm.protocol.ssh.jsch;


import com.atsebak.embeddedlinuxjvm.console.EmbeddedLinuxJVMConsoleView;
import com.atsebak.embeddedlinuxjvm.localization.EmbeddedLinuxJVMBundle;
import com.atsebak.embeddedlinuxjvm.protocol.ssh.SSHHandlerTarget;
import com.blocklatency.embeddedlinuxjvm.console.EmbeddedLinuxJVMConsoleView;
import com.blocklatency.embeddedlinuxjvm.localization.EmbeddedLinuxJVMBundle;
import com.blocklatency.embeddedlinuxjvm.protocol.ssh.SSHHandlerTarget;
import com.intellij.execution.ui.ConsoleViewContentType;
import com.jcraft.jsch.SftpProgressMonitor;
import org.jetbrains.annotations.NotNull;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.atsebak.embeddedlinuxjvm.runner;
package com.blocklatency.embeddedlinuxjvm.runner;

import com.atsebak.embeddedlinuxjvm.console.EmbeddedLinuxJVMToolWindowFactory;
import com.atsebak.embeddedlinuxjvm.console.EmbeddedLinuxJVMConsoleView;
import com.atsebak.embeddedlinuxjvm.runner.conf.EmbeddedLinuxJVMRunConfiguration;
import com.blocklatency.embeddedlinuxjvm.console.EmbeddedLinuxJVMToolWindowFactory;
import com.blocklatency.embeddedlinuxjvm.console.EmbeddedLinuxJVMConsoleView;
import com.blocklatency.embeddedlinuxjvm.runner.conf.EmbeddedLinuxJVMRunConfiguration;
import com.intellij.debugger.impl.GenericDebuggerRunner;
import com.intellij.execution.ExecutionException;
import com.intellij.execution.configurations.RunProfile;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
package com.atsebak.embeddedlinuxjvm.runner;
package com.blocklatency.embeddedlinuxjvm.runner;

import com.atsebak.embeddedlinuxjvm.console.EmbeddedLinuxJVMToolWindowFactory;
import com.atsebak.embeddedlinuxjvm.console.EmbeddedLinuxJVMConsoleView;
import com.atsebak.embeddedlinuxjvm.runner.conf.EmbeddedLinuxJVMRunConfiguration;
import com.blocklatency.embeddedlinuxjvm.console.EmbeddedLinuxJVMToolWindowFactory;
import com.blocklatency.embeddedlinuxjvm.console.EmbeddedLinuxJVMConsoleView;
import com.blocklatency.embeddedlinuxjvm.runner.conf.EmbeddedLinuxJVMRunConfiguration;
import com.intellij.execution.ExecutionException;
import com.intellij.execution.configurations.RunProfile;
import com.intellij.execution.configurations.RunProfileState;
import com.intellij.execution.executors.DefaultRunExecutor;
import com.intellij.execution.impl.DefaultJavaProgramRunner;
import com.intellij.execution.runners.DefaultProgramRunner;
import com.intellij.execution.runners.ExecutionEnvironment;
import com.intellij.execution.ui.RunContentDescriptor;
import com.intellij.openapi.fileEditor.FileDocumentManager;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.atsebak.embeddedlinuxjvm.runner.conf;
package com.blocklatency.embeddedlinuxjvm.runner.conf;

import com.intellij.execution.configurations.ConfigurationFactory;
import com.intellij.execution.configurations.ConfigurationType;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.atsebak.embeddedlinuxjvm.runner.conf;
package com.blocklatency.embeddedlinuxjvm.runner.conf;

import com.atsebak.embeddedlinuxjvm.commandline.AppCommandLineState;
import com.atsebak.embeddedlinuxjvm.runner.data.EmbeddedLinuxJVMRunConfigurationRunnerParameters;
import com.atsebak.embeddedlinuxjvm.runner.data.EmbeddedLinuxJVMRunnerValidator;
import com.atsebak.embeddedlinuxjvm.ui.RunConfigurationEditor;
import com.blocklatency.embeddedlinuxjvm.commandline.AppCommandLineState;
import com.blocklatency.embeddedlinuxjvm.runner.data.EmbeddedLinuxJVMRunConfigurationRunnerParameters;
import com.blocklatency.embeddedlinuxjvm.runner.data.EmbeddedLinuxJVMRunnerValidator;
import com.blocklatency.embeddedlinuxjvm.ui.RunConfigurationEditor;
import com.intellij.execution.ExecutionException;
import com.intellij.execution.Executor;
import com.intellij.execution.configurations.*;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.atsebak.embeddedlinuxjvm.runner.data;
package com.blocklatency.embeddedlinuxjvm.runner.data;


import lombok.Data;
Expand Down
Loading

0 comments on commit 58fd17d

Please sign in to comment.