Skip to content

Commit

Permalink
Merge pull request #26 from vibe-d/reset_to_current_vibe_d
Browse files Browse the repository at this point in the history
Reset the code base to use the current master state in vibe.d.
  • Loading branch information
s-ludwig authored Feb 6, 2024
2 parents 25e16eb + 06c6edf commit 6c13eac
Show file tree
Hide file tree
Showing 112 changed files with 3,287 additions and 9,508 deletions.
17 changes: 0 additions & 17 deletions .codecov.yml

This file was deleted.

9 changes: 0 additions & 9 deletions .editorconfig

This file was deleted.

75 changes: 67 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,31 +9,90 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ ubuntu-latest ]
dc: [ dmd-latest, dmd-2.094.2, dmd-2.089.1, dmd-2.084.1, ldc-1.24.0, ldc-1.21.0, ldc-1.17.0 ]
os:
- ubuntu-latest
dc:
- dmd-latest
- dmd-2.097.1
- dmd-2.096.1
- dmd-2.093.1
- dmd-2.091.1
- ldc-latest
- ldc-1.27.1
- ldc-1.26.0
- ldc-1.23.0
- ldc-1.21.0
parts:
- 'builds,unittests,examples,tests'
extra_dflags:
- ''
include:
# Default
- { parts: 'builds,unittests,examples,tests', extra_dflags: '' }
# Custom part for coverage
- { dc: dmd-2.094.2, parts: 'unittests,tests', extra_dflags: "-cov -version=VibedSetCoverageMerge" }
- { os: ubuntu-latest, dc: dmd-latest, parts: 'unittests,tests', extra_dflags: "-cov -version=VibedSetCoverageMerge" }
# Custom part for vibe-core 1.x.x testing
- { os: ubuntu-latest, dc: dmd-latest, parts: 'builds,unittests,tests', extra_dflags: '' }

runs-on: ${{ matrix.os }}
timeout-minutes: 60

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Prepare compiler
uses: dlang-community/setup-dlang@v1
with:
compiler: ${{ matrix.dc }}
dub: 1.29.0

- name: '[POSIX] Run tests'
env:
PARTS: builds,unittests,examples,tests
VIBED_DRIVER: vibe-core
PARTS: ${{ matrix.parts }}
run: |
./travis-ci.sh
./run-ci.sh
- name: '[DMD] Upload coverage to Codecov'
if: matrix.dc == 'dmd-latest'
uses: codecov/codecov-action@v1


main_win:
name: Run Windows
strategy:
fail-fast: false
matrix:
os:
- windows-latest
dc:
- dmd-latest
- dmd-2.097.1
- dmd-2.096.1
- dmd-2.093.1
- dmd-2.091.1
- ldc-latest
- ldc-1.27.1
- ldc-1.26.0
- ldc-1.23.0
- ldc-1.21.0
parts:
- 'builds,unittests,examples,tests'
extra_dflags:
- ''

runs-on: ${{ matrix.os }}
timeout-minutes: 60

steps:
- uses: actions/checkout@v3

- name: Prepare compiler
uses: dlang-community/setup-dlang@v1
with:
compiler: ${{ matrix.dc }}
dub: 1.29.0

- name: '[POSIX] Run tests'
env:
PARTS: ${{ matrix.parts }}
run: |
./run-ci.sh
52 changes: 47 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,48 @@
/libevent.dll
/dub.selections.json
/http-test-library.exe
*.[oa]
*.so
*.lib
*.dll
.*.sw*
*.lst
*.map
*.pdb
*.suo
*.sln
*.visualdproj
*.exe_cv

docs.json
/docs
__dummy.html

.dub
libvibe-http.a
vibe-http-test-library
dub.selections.json

# Auto-generated
tls/openssl_version.d

# Auto-downloaded 3rd-party (Meson)
lib/subprojects/allocator
lib/subprojects/diet/
lib/subprojects/openssl/

# Mono-D files
*.userprefs

# Unittest binaries
vibe-d
tests/*/tests
__test__*__
vibe-d-test*
vibe-d-*-test*

# Examples
examples/*/*-example
examples/app_skeleton/app-skeleton
examples/app_skeleton/__test__library__
examples/bench-http-request/bench-http-request
examples/bench-http-server/bench-http-server
examples/bench-mongodb/bench-mongodb
examples/bench-urlrouter/bench-urlrouter
*.exe

14 changes: 0 additions & 14 deletions CONTRIBUTING.md

This file was deleted.

7 changes: 0 additions & 7 deletions LICENSE.txt

This file was deleted.

7 changes: 0 additions & 7 deletions LICENSE_DE.txt

This file was deleted.

20 changes: 0 additions & 20 deletions README.md

This file was deleted.

114 changes: 0 additions & 114 deletions appveyor.yml

This file was deleted.

19 changes: 5 additions & 14 deletions dub.sdl
Original file line number Diff line number Diff line change
@@ -1,17 +1,8 @@
name "vibe-http"
description "HTTP server and client implementation and higher level HTTP functionality"
homepage "https://vibed.org/"

license "MIT"
copyright "Copyright © 2012-2019 Sönke Ludwig"
authors "Sönke Ludwig" "Francesco Galla" "see GitHub for all"

dependency "vibe-d:crypto" version=">0.8.4"
dependency "vibe-d:tls" version=">0.8.4"
dependency "vibe-d:inet" version="*"
dependency "vibe-d:stream" version="*"
dependency "vibe-d:textfilter" version="*"
dependency "diet-ng" version="~>1.1"
dependency "taggedalgebraic" version=">=0.10.9 <0.12.0-0"

dependency "vibe-d:crypto" version="~>0.9.7"
dependency "vibe-d:inet" version="~>0.9.7"
dependency "vibe-d:tls" version="~>0.9.7"
dependency "vibe-d:textfilter" version="~>0.9.0"
dependency "diet-ng" version="~>1.2"
targetType "library"
3 changes: 3 additions & 0 deletions examples/auth_basic/dub.sdl
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
name "auth-basic-example"
description "Demonstrates basic authentication."
dependency "vibe-http" path="../../"
Loading

0 comments on commit 6c13eac

Please sign in to comment.