Skip to content

Commit

Permalink
Merge pull request #9 from alfhenrik/dev
Browse files Browse the repository at this point in the history
Get Travis-CI build going
  • Loading branch information
hnrkndrssn committed Jun 10, 2015
2 parents 4ac581b + 840649b commit 0a5f607
Show file tree
Hide file tree
Showing 9 changed files with 49 additions and 23 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
## Ignore Visual Studio temporary files, build results, and
## files generated by popular Visual Studio add-ons.
*.lock.json

# User-specific files
*.suo
Expand Down
4 changes: 4 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
language: CSharp
mono: latest
script:
- ./build.sh --quiet verify
8 changes: 8 additions & 0 deletions NuGet.Config
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<add key="AspNetRelease" value="https://www.myget.org/F/aspnetrelease/api/v2" />
<add key="NuGet" value="https://nuget.org/api/v2/" />
<add key="AspNetVNext" value="https://www.myget.org/F/aspnetvnext/api/v2" />
</packageSources>
</configuration>
12 changes: 0 additions & 12 deletions NuGet.config

This file was deleted.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# JabbR v2
# JabbR v2 [![Build Status](https://travis-ci.org/alfhenrik/JabbRv2.svg?branch=dev)](https://travis-ci.org/alfhenrik/JabbRv2)

JabbR is a xplat chat web application built with ASP.NET 5 and MVC 6 using SignalR.

Expand Down
23 changes: 23 additions & 0 deletions build.cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
@echo off
cd %~dp0

IF EXIST artifacts\ RMDIR /S /Q artifacts\
IF EXIST src\JabbR\wwwroot\lib\ RMDIR /S /Q src\JabbR\wwwroot\lib\

SETLOCAL
SET CACHED_DNVM=%USERPROFILE%\.dnx\bin\dnvm.cmd
SET DNX_UNSTABLE_FEED=https://www.myget.org/F/aspnetrelease/api/v2

IF EXIST %CACHED_DNVM% GOTO dnvminstall
echo Installing dnvm
@powershell -NoProfile -ExecutionPolicy unrestricted -Command "&{$Branch='dev';iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/aspnet/Home/dev/dnvminstall.ps1'))}"

:dnvminstall
echo Installing dnx...
CALL dnvm install 1.0.0-beta5-11911 -u

echo Restoring...
CALL dnu restore src/JabbR

echo Publishing...
CALL dnu publish src/JabbR --no-source --out artifacts/build/jabbr --runtime active
8 changes: 5 additions & 3 deletions build.sh
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
#!/bin/bash
rm -rf artifacts

rm -rf artifacts/* src/JabbR/wwwroot/lib/*

if ! type dnvm > /dev/null 2>&1; then
curl -sSL https://raw.githubusercontent.com/aspnet/Home/dev/dnvminstall.sh | sh && source ~/.dnx/dnvm/dnvm.sh
fi
export DNX_UNSTABLE_FEED=https://www.myget.org/F/aspnetrelease/api/v2
dnvm install 1.0.0-beta5-11911
dnvm install 1.0.0-beta5-11911 -u
dnu restore src/JabbR

rc=$?; if [[ $rc != 0 ]]; then exit $rc; fi

dnu publish src/JabbR --no-source --out artifacts/build/jabbr --runtime active 2>&1 | tee buildlog
grep "Build succeeded" buildlog
grep "Build succeeded" buildlog
6 changes: 6 additions & 0 deletions makefile.shade
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
var VERSION='0.1'
var FULL_VERSION='0.1'
var AUTHORS='JabbR Kore Team'

use-standard-lifecycle
k-standard-goals
8 changes: 1 addition & 7 deletions src/JabbR/Startup.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,6 @@ public class Startup
public Startup(IHostingEnvironment env, IApplicationEnvironment appEnv)
{
// Setup configuration sources.
// Configuration = new ConfigurationSection(appEnv.ApplicationBasePath)
// .AddJsonFile("config.json")
// .AddEnvironmentVariables();
}

public IConfiguration Configuration { get; set; }
Expand All @@ -46,9 +43,9 @@ public void ConfigureServices(IServiceCollection services)
// Configure is called after ConfigureServices is called.
public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerfactory)
{
// Configure the HTTP request pipeline.
app.UseKestrelWorkaround();

// Configure the HTTP request pipeline.
// Add the console logger.
loggerfactory.AddConsole();

Expand All @@ -74,9 +71,6 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF
name: "default",
template: "{controller}/{action}/{id?}",
defaults: new { controller = "Home", action = "Index" });

// Uncomment the following line to add a route for porting Web API 2 controllers.
// routes.MapWebApiRoute("DefaultApi", "api/{controller}/{id?}");
});

app.UseSignalR();
Expand Down

0 comments on commit 0a5f607

Please sign in to comment.