From 460096728b6b11cf7317bb0a9e26e0e4d30352f6 Mon Sep 17 00:00:00 2001 From: BBasile Date: Wed, 2 Jan 2019 16:20:15 +0100 Subject: [PATCH] Cleanup, remove socimantic stuff, close #406 (#418) Cleanup, remove sociomantic stuff, close #406 merged-on-behalf-of: BBasile --- .gitmodules | 6 ------ .travis.yml | 29 +---------------------------- beaver | 1 - beaver.Dockerfile | 6 ------ makd | 1 - pkg/dfmt.pkg | 31 ------------------------------- 6 files changed, 1 insertion(+), 73 deletions(-) delete mode 160000 beaver delete mode 100644 beaver.Dockerfile delete mode 160000 makd delete mode 100644 pkg/dfmt.pkg diff --git a/.gitmodules b/.gitmodules index 9395750..621577b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,12 +1,6 @@ [submodule "libdparse"] path = libdparse url = https://github.com/dlang-community/libdparse.git -[submodule "makd"] - path = makd - url = https://github.com/sociomantic-tsunami/makd -[submodule "beaver"] - path = beaver - url = https://github.com/sociomantic-tsunami/beaver.git [submodule "stdx-allocator"] path = stdx-allocator url = https://github.com/dlang-community/stdx-allocator diff --git a/.travis.yml b/.travis.yml index a4103ad..904e4f1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,15 +1,12 @@ sudo: false language: d d: - #- dmd-nightly - - dmd-beta - dmd - - ldc-beta - ldc os: - linux -# - osx # disabled until travis has more mac resources + - osx branches: only: @@ -24,30 +21,6 @@ script: ./.travis.sh jobs: include: - - stage: Build & Upload Package - if: tag IS present - # Which package to deploy - env: - - DMD=2.076.* - - DIST=xenial - - PATH="$(git config -f .gitmodules submodule.beaver.path)/bin:$PATH" - language: generic - sudo: required - services: - - docker - git: - submodules: false - before_install: git submodule update --init - install: beaver dlang install - script: - - beaver dlang make pkg - deploy: - provider: script - script: beaver bintray upload -d dlang-community/apt/dfmt build/last/pkg/*.deb - skip_cleanup: true - on: - tags: true # must be a git tag - repo: dlang-community/dfmt # must be a tag on dlang-community - stage: GitHub Release #if: tag IS present d: ldc-1.8.0 diff --git a/beaver b/beaver deleted file mode 160000 index 82f8c8f..0000000 --- a/beaver +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 82f8c8f6bbd9f0fbd9753a134377bec134a5956c diff --git a/beaver.Dockerfile b/beaver.Dockerfile deleted file mode 100644 index 8fc905b..0000000 --- a/beaver.Dockerfile +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright sociomantic labs GmbH 2017. -# Distributed under the Boost Software License, Version 1.0. -# (See accompanying file LICENSE.txt or copy at -# http://www.boost.org/LICENSE_1_0.txt) - -FROM sociomantictsunami/dlang:v4 diff --git a/makd b/makd deleted file mode 160000 index d735c1d..0000000 --- a/makd +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d735c1df67399693f699f8315418173a55de5313 diff --git a/pkg/dfmt.pkg b/pkg/dfmt.pkg deleted file mode 100644 index 94d5b38..0000000 --- a/pkg/dfmt.pkg +++ /dev/null @@ -1,31 +0,0 @@ -# dfmt packaging configuration -# ============================ - -dfmt_bindir='bin' - -#------------------------------------------------------------------------------- -# Define the keyword arguments to pass to fpm (via the OPTS dict) -#------------------------------------------------------------------------------- - -OPTS.update( - name = "dfmt", - url = 'https://github.com/dlang-community/dfmt', - maintainer = 'Stefan Koch ', - vendor = 'Sociomantic Labs GmbH', - provides = "dfmt", - description = '''\ -D source code formatter -''', - depends = FUN.autodeps('dfmt', path=dfmt_bindir), -) - -#------------------------------------------------------------------------------- -# Define the positional arguments to pass to fpm (via the ARGS list) -#------------------------------------------------------------------------------- - -ARGS.extend(FUN.mapfiles(dfmt_bindir, '/usr/bin', 'dfmt')) -ARGS.extend([ - 'bash-completion/completions/dfmt=/usr/share/bash-completion/completions/dfmt' -]) - -# vim: set ft=python tw=80 :