Skip to content

Commit

Permalink
Update first wave of references
Browse files Browse the repository at this point in the history
  • Loading branch information
ethanis committed Nov 1, 2022
1 parent ccfcad4 commit 60b3f22
Show file tree
Hide file tree
Showing 74 changed files with 151 additions and 146 deletions.
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1 +1 @@
* @github/valet-reviewers
* @github/actions-importer-reviewers
8 changes: 4 additions & 4 deletions .github/ISSUE_TEMPLATE/support.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
## Description

name: Bug Report
description: Request support or help from the Valet team
description: Request support or help from the Actions Importer team
title: "[Support]: "
labels: ["help wanted"]
body:
Expand All @@ -18,10 +18,10 @@ body:
- label: macOS
- label: Windows
- type: textarea
id: valet-version
id: actions-importer-version
attributes:
label: What version of the tool are you using?
placeholder: i.e. the output of `gh valet version`
placeholder: i.e. the output of `gh actions-importer version`
validations:
required: true
- type: textarea
Expand All @@ -40,7 +40,7 @@ body:
id: terms
attributes:
label: Code of Conduct
description: By submitting this issue, you agree to follow our [Code of Conduct](https://github.com/github/gh-valet/blob/main/CODE_OF_CONDUCT.md)
description: By submitting this issue, you agree to follow our [Code of Conduct](https://github.com/github/gh-actions-importer/blob/main/CODE_OF_CONDUCT.md)
options:
- label: I agree to follow this project's Code of Conduct
required: true
30 changes: 15 additions & 15 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- name: install dotnet-format
run: dotnet tool install -g dotnet-format --version "5.1.*" --add-source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
- name: lint
run: dotnet format src/Valet.sln --verify-no-changes
run: dotnet format src/ActionsImporter.sln --verify-no-changes

unit-test:
runs-on: ubuntu-latest
Expand All @@ -32,11 +32,11 @@ jobs:
with:
dotnet-version: ${{ env.DOTNET_VERSION }}
- name: dotnet restore
run: dotnet restore src/Valet.sln
run: dotnet restore src/ActionsImporter.sln
- name: dotnet build
run: dotnet build src/Valet.sln
run: dotnet build src/ActionsImporter.sln
- name: dotnet test
run: dotnet test src/Valet.UnitTests/Valet.UnitTests.csproj --no-build --no-restore --logger "junit;LogFilePath=unit-tests.xml"
run: dotnet test src/ActionsImporter.UnitTests/ActionsImporter.UnitTests.csproj --no-build --no-restore --logger "junit;LogFilePath=unit-tests.xml"
- name: publish test results
uses: EnricoMi/publish-unit-test-result-action@v1
if: always()
Expand All @@ -52,20 +52,20 @@ jobs:
with:
dotnet-version: ${{ env.DOTNET_VERSION }}
- name: dotnet restore
run: dotnet restore src/Valet.sln
run: dotnet restore src/ActionsImporter.sln
- name: dotnet build
run: dotnet build src/Valet.sln
run: dotnet build src/ActionsImporter.sln
- name: dotnet publish
run: |
dotnet publish src/Valet/Valet.csproj -c Release -r win10-x64 --self-contained -o dist/win-x64 --no-restore -p:PublishSingleFile=true /p:IncludeNativeLibrariesForSelfExtract=true
dotnet publish src/Valet/Valet.csproj -c Release -r osx-x64 --self-contained -o dist/osx-x64 --no-restore -p:PublishSingleFile=true /p:IncludeNativeLibrariesForSelfExtract=true
dotnet publish src/Valet/Valet.csproj -c Release -r linux-x64 --self-contained -o dist/linux-x64 --no-restore -p:PublishSingleFile=true /p:IncludeNativeLibrariesForSelfExtract=true
dotnet publish src/ActionsImporter/ActionsImporter.csproj -c Release -r win10-x64 --self-contained -o dist/win-x64 --no-restore -p:PublishSingleFile=true /p:IncludeNativeLibrariesForSelfExtract=true
dotnet publish src/ActionsImporter/ActionsImporter.csproj -c Release -r osx-x64 --self-contained -o dist/osx-x64 --no-restore -p:PublishSingleFile=true /p:IncludeNativeLibrariesForSelfExtract=true
dotnet publish src/ActionsImporter/ActionsImporter.csproj -c Release -r linux-x64 --self-contained -o dist/linux-x64 --no-restore -p:PublishSingleFile=true /p:IncludeNativeLibrariesForSelfExtract=true
- name: prepare staging
run: |
mkdir -p ${{ runner.temp }}/staging
cp dist/win-x64/gh-valet.exe ${{ runner.temp }}/staging/valet-windows-amd64.exe
cp dist/osx-x64/gh-valet ${{ runner.temp }}/staging/valet-darwin-amd64
cp dist/linux-x64/gh-valet ${{ runner.temp }}/staging/valet-linux-amd64
cp dist/win-x64/gh-actions-importer.exe ${{ runner.temp }}/staging/actions-importer-windows-amd64.exe
cp dist/osx-x64/gh-actions-importer ${{ runner.temp }}/staging/actions-importer-darwin-amd64
cp dist/linux-x64/gh-actions-importer ${{ runner.temp }}/staging/actions-importer-linux-amd64
- name: publish artifacts
uses: actions/upload-artifact@v3
Expand Down Expand Up @@ -106,6 +106,6 @@ jobs:
generate_release_notes: true
fail_on_unmatched_files: true
files: |
${{ runner.temp }}/dist/valet-windows-amd64.exe
${{ runner.temp }}/dist/valet-linux-amd64
${{ runner.temp }}/dist/valet-darwin-amd64
${{ runner.temp }}/dist/actions-importer-windows-amd64.exe
${{ runner.temp }}/dist/actions-importer-linux-amd64
${{ runner.temp }}/dist/actions-importer-darwin-amd64
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
.DS_STORE
output/
dist/
gh-valet
gh-actions-importer

.env.*local
# User-specific files (MonoDevelop/Xamarin Studio)
*.userprefs
Expand Down
8 changes: 4 additions & 4 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ If you think you've found a bug or have a great idea for new functionality pleas

## How to provide feedback or ask for help

Use the [Discussions](https://github.com/github/gh-valet/discussions) tab in this repo for more general feedback or any questions/comments on this tooling.
Use the [Discussions](https://github.com/github/gh-actions-importer/discussions) tab in this repo for more general feedback or any questions/comments on this tooling.

## Configure your development environment

Expand All @@ -23,19 +23,19 @@ To get started, you'll need [.NET Core 6.0](https://dotnet.microsoft.com/en-us/d
The solution can be built using the following command:

```bash
$ dotnet build src/Valet.sln
$ dotnet build src/ActionsImporter.sln
```

Unit tests can be run using the following command:

```bash
$ dotnet test src/Valet.sln
$ dotnet test src/ActionsImporter.sln
```

Code linting can be run using the following command:

```bash
$ dotnet format src/Valet.sln
$ dotnet format src/ActionsImporter.sln
```

## Submitting a Pull Request
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# GitHub Valet CLI
# GitHub Actions Importer CLI

[![.github/workflows/ci.yml](https://github.com/github/gh-valet/actions/workflows/ci.yml/badge.svg)](https://github.com/github/gh-valet/actions/workflows/ci.yml)
[![.github/workflows/ci.yml](https://github.com/github/gh-actions-importer/actions/workflows/ci.yml/badge.svg)](https://github.com/github/gh-actions-importer/actions/workflows/ci.yml)

Valet helps facilitate the migration of Azure DevOps, CircleCI, GitLab CI, Jenkins, and Travis CI pipelines to GitHub Actions. This repository provides functionality that extends the [GitHub CLI](https://cli.github.com/) to migrate pipelines to GitHub Actions using Valet.

> Valet is currently private and customers must be onboarded prior to using the `gh-valet` CLI extension. Please reach out to [GitHub Sales](https://github.com/enterprise/contact) to inquire about being granted access.
> Valet is currently private and customers must be onboarded prior to using the `gh-actions-importer` CLI extension. Please reach out to [GitHub Sales](https://github.com/enterprise/contact) to inquire about being granted access.
**Note**: You can request support by creating an issue [here](https://github.com/github/gh-valet/issues/new?assignees=&labels=help+wanted&template=support.yml&title=%5BSupport%5D%3A+). The Valet team responds to support requests Monday through Friday between the hours of 9AM EST and 5PM PST.
**Note**: You can request support by creating an issue [here](https://github.com/github/gh-actions-importer/issues/new?assignees=&labels=help+wanted&template=support.yml&title=%5BSupport%5D%3A+). The Valet team responds to support requests Monday through Friday between the hours of 9AM EST and 5PM PST.

## Supported platforms

Expand Down Expand Up @@ -37,7 +37,7 @@ The following requirements must be met to be able to run Valet:
Next, the Valet CLI extension can be installed via this command:

```bash
$ gh extension install github/gh-valet
$ gh extension install github/gh-actions-importer
```

To verify the extension is installed, run this command:
Expand Down
2 changes: 1 addition & 1 deletion src/.editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ end_of_line = lf
indent_size = 2

# The following applies to unit tests directory only.
[Valet.UnitTests/**.cs]
[ActionsImporter.UnitTests/**.cs]

# CA1707: Identifiers should not contain underscores
dotnet_diagnostic.CA1707.severity = none
Expand Down
25 changes: 25 additions & 0 deletions src/ActionsImporter.UnitTests/ActionsImporter.UnitTests.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>

<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="JUnitTestLogger" Version="1.1.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
<PackageReference Include="Moq" Version="4.18.2" />
<PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
<PackageReference Include="coverlet.collector" Version="3.1.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\ActionsImporter\ActionsImporter.csproj" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
using System;
using System.IO;
using System.Threading.Tasks;
using ActionsImporter.Interfaces;
using Moq;
using NUnit.Framework;
using Valet.Interfaces;

namespace Valet.UnitTests;
namespace ActionsImporter.UnitTests;

[TestFixture]
public class AppTests
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
using System.Text.Json;
using ActionsImporter.Models.Docker;
using NUnit.Framework;
using Valet.Models.Docker;

namespace Valet.UnitTests;
namespace ActionsImporter.UnitTests.Models;

[TestFixture]
public class ManifestTests
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using NUnit.Framework;
using Valet.Models;
using ActionsImporter.Models;
using NUnit.Framework;

namespace Valet.UnitTests.Models;
namespace ActionsImporter.UnitTests.Models;

[TestFixture]
public class StringExtensionsTests
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using NUnit.Framework;
using Valet.Models;
using ActionsImporter.Models;
using NUnit.Framework;

namespace Valet.UnitTests.Models;
namespace ActionsImporter.UnitTests.Models;

[TestFixture]
public class VariableTests
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
using System.Collections.Immutable;
using System.IO;
using System.Threading.Tasks;
using ActionsImporter.Interfaces;
using ActionsImporter.Services;
using NUnit.Framework;
using Valet.Interfaces;
using Valet.Services;

namespace Valet.UnitTests.Services;
namespace ActionsImporter.UnitTests.Services;

[TestFixture]
public class ConfigurationServiceTests
Expand Down Expand Up @@ -68,7 +68,7 @@ public async Task ReadCurrentVariablesAsync_FileDoesNotExist_ReturnsEmptyVariabl
public async Task ReadCurrentVariablesAsync_FileExists_ReturnsVariables()
{
// Arrange
var filePath = Path.Combine(Path.GetTempPath(), "gh-valet.tests", ".env.local");
var filePath = Path.Combine(Path.GetTempPath(), "gh-actions-importer.tests", ".env.local");
var directory = Path.GetDirectoryName(filePath)!;

var contents = @"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
using System.Collections.Generic;
using System.IO;
using System.Threading.Tasks;
using ActionsImporter.Interfaces;
using ActionsImporter.Services;
using Moq;
using NUnit.Framework;
using Valet.Interfaces;
using Valet.Services;

namespace Valet.UnitTests.Services;
namespace ActionsImporter.UnitTests.Services;

[TestFixture]
public class DockerServiceTests
Expand Down
4 changes: 2 additions & 2 deletions src/Valet.sln → src/ActionsImporter.sln
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@

Microsoft Visual Studio Solution File, Format Version 12.00
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Valet", "Valet\Valet.csproj", "{2BDDC277-D122-4D92-BE5B-B471661AF6ED}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ActionsImporter", "ActionsImporter\ActionsImporter.csproj", "{2BDDC277-D122-4D92-BE5B-B471661AF6ED}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Valet.UnitTests", "Valet.UnitTests\Valet.UnitTests.csproj", "{5EA9047C-5831-421C-926E-87C0BFFE7678}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ActionsImporter.UnitTests", "ActionsImporter.UnitTests\ActionsImporter.UnitTests.csproj", "{5EA9047C-5831-421C-926E-87C0BFFE7678}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<TargetFramework>net6.0</TargetFramework>
<RuntimeIdentifiers>win10-x64;osx-x64;linux-x64</RuntimeIdentifiers>
<ImplicitUsings>enable</ImplicitUsings>
<AssemblyName>gh-valet</AssemblyName>
<AssemblyName>gh-actions-importer</AssemblyName>
</PropertyGroup>

<ItemGroup>
Expand Down
8 changes: 4 additions & 4 deletions src/Valet/App.cs → src/ActionsImporter/App.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Valet.Interfaces;
using Valet.Models;
using ActionsImporter.Interfaces;
using ActionsImporter.Models;

namespace Valet;
namespace ActionsImporter;

public class App
{
Expand Down Expand Up @@ -72,7 +72,7 @@ public async Task<int> GetVersionAsync()

var formattedGhVersion = ghVersion.Split(Environment.NewLine, StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries).FirstOrDefault();
var formattedGhValetVersion = ghValetVersion.Split(Environment.NewLine, StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries)
.FirstOrDefault(x => x.Contains("github/gh-valet", StringComparison.Ordinal));
.FirstOrDefault(x => x.Contains("github/gh-actions-importer", StringComparison.Ordinal));
var formattedValetVersion = valetVersion.Split(Environment.NewLine, StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries).FirstOrDefault() ?? "unknown";

Console.WriteLine(formattedGhVersion);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using System.CommandLine;
namespace Valet.Commands;

namespace ActionsImporter.Commands;

public class Audit : BaseCommand
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System.Collections.Immutable;
using System.CommandLine;

namespace Valet.Commands.AzureDevOps;
namespace ActionsImporter.Commands.AzureDevOps;

public class Audit : ContainerCommand
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System.Collections.Immutable;
using System.CommandLine;

namespace Valet.Commands.AzureDevOps.BuildPipeline;
namespace ActionsImporter.Commands.AzureDevOps.BuildPipeline;

public class DryRun : ContainerCommand
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System.Collections.Immutable;
using System.CommandLine;

namespace Valet.Commands.AzureDevOps.BuildPipeline;
namespace ActionsImporter.Commands.AzureDevOps.BuildPipeline;

public class Migrate : ContainerCommand
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System.CommandLine;

namespace Valet.Commands.AzureDevOps;
namespace ActionsImporter.Commands.AzureDevOps;

public static class Common
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System.CommandLine;

namespace Valet.Commands.AzureDevOps;
namespace ActionsImporter.Commands.AzureDevOps;

public class DryRun : BaseCommand
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System.Collections.Immutable;
using System.CommandLine;

namespace Valet.Commands.AzureDevOps;
namespace ActionsImporter.Commands.AzureDevOps;

public class Forecast : ContainerCommand
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System.CommandLine;

namespace Valet.Commands.AzureDevOps;
namespace ActionsImporter.Commands.AzureDevOps;

public class Migrate : BaseCommand
{
Expand Down
Loading

0 comments on commit 60b3f22

Please sign in to comment.