Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/devel' into 13443
Browse files Browse the repository at this point in the history
  • Loading branch information
ringabout committed Mar 30, 2021
2 parents 12db88d + 159c06e commit 4c122d1
Show file tree
Hide file tree
Showing 1,069 changed files with 53,700 additions and 58,553 deletions.
2 changes: 1 addition & 1 deletion .builds/openbsd_0.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ packages:
sources:
- https://github.com/nim-lang/Nim
environment:
NIM_TESTAMENT_BATCH: "0_3"
NIM_TESTAMENT_BATCH: "0_2"
CC: /usr/bin/clang
tasks:
- setup: |
Expand Down
2 changes: 1 addition & 1 deletion .builds/openbsd_1.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ packages:
sources:
- https://github.com/nim-lang/Nim
environment:
NIM_TESTAMENT_BATCH: "1_3"
NIM_TESTAMENT_BATCH: "1_2"
CC: /usr/bin/clang
tasks:
- setup: |
Expand Down
34 changes: 0 additions & 34 deletions .builds/openbsd_2.yml

This file was deleted.

10 changes: 10 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
contact_links:
- name: Forum
url: https://forum.nim-lang.org
about: Please ask and answer questions here.
- name: Discord
url: https://discord.gg/nim
about: Please ask and answer questions here.
- name: Stack Overflow
url: https://stackoverflow.com/questions/tagged/nim-lang
about: Please ask and answer questions here.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml.disabled
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,11 @@ jobs:
curl -L https://nim-lang.org/download/dlls.zip -o dist/dlls.zip
7z x dist/mingw64.7z -odist
7z x dist/dlls.zip -obin
echo "::add-path::${{ github.workspace }}/dist/mingw64/bin"
echo "${{ github.workspace }}/dist/mingw64/bin" >> "${GITHUB_PATH}"

- name: 'Add build binaries to PATH'
shell: bash
run: echo "::add-path::${{ github.workspace }}/bin"
run: echo "${{ github.workspace }}/bin" >> "${GITHUB_PATH}"

- name: 'Build csources'
shell: bash
Expand Down
10 changes: 3 additions & 7 deletions .github/workflows/ci_docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ on:
- 'tools/dochack/dochack.nim'
- 'tools/kochdocs.nim'
- '.github/workflows/ci_docs.yml'

- 'koch.nim'

jobs:
build:
Expand Down Expand Up @@ -64,11 +64,11 @@ jobs:
curl -L https://nim-lang.org/download/dlls.zip -o dist/dlls.zip
7z x dist/mingw64.7z -odist
7z x dist/dlls.zip -obin
echo "::add-path::${{ github.workspace }}/dist/mingw64/bin"
echo "${{ github.workspace }}/dist/mingw64/bin" >> "${GITHUB_PATH}"
- name: 'Add build binaries to PATH'
shell: bash
run: echo "::add-path::${{ github.workspace }}/bin"
run: echo "${{ github.workspace }}/bin" >> "${GITHUB_PATH}"

- name: 'Get current csources version'
id: csources-version
Expand Down Expand Up @@ -126,10 +126,6 @@ jobs:
shell: bash
run: ./koch boot -d:release

- name: 'Clone fusion'
shell: bash
run: ./koch fusion

- name: 'Build documentation'
shell: bash
run: ./koch doc --git.commit:devel
Expand Down
11 changes: 6 additions & 5 deletions .github/workflows/ci_packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,12 @@ jobs:
matrix:
os: [ubuntu-18.04, macos-10.15]
cpu: [amd64]
pkg: [1, 2]
name: '${{ matrix.os }} (pkg: ${{ matrix.pkg }})'
batch: ["0_3", "1_3", "2_3"] # list of `index_num`
name: '${{ matrix.os }} (batch: ${{ matrix.batch }})'
runs-on: ${{ matrix.os }}
env:
NIM_TEST_PACKAGES: ${{ matrix.pkg }}
NIM_TEST_PACKAGES: "1"
NIM_TESTAMENT_BATCH: ${{ matrix.batch }}
steps:
- name: 'Checkout'
uses: actions/checkout@v2
Expand Down Expand Up @@ -48,11 +49,11 @@ jobs:
curl -L https://nim-lang.org/download/dlls.zip -o dist/dlls.zip
7z x dist/mingw64.7z -odist
7z x dist/dlls.zip -obin
echo "::add-path::${{ github.workspace }}/dist/mingw64/bin"
echo "${{ github.workspace }}/dist/mingw64/bin" >> "${GITHUB_PATH}"
- name: 'Add build binaries to PATH'
shell: bash
run: echo "::add-path::${{ github.workspace }}/bin"
run: echo "${{ github.workspace }}/bin" >> "${GITHUB_PATH}"

- name: 'Build csources'
shell: bash
Expand Down
93 changes: 0 additions & 93 deletions .github/workflows/ci_ssl.yml

This file was deleted.

6 changes: 4 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ deinstall.sh

doc/html/
doc/*.html
doc/*.pdf
doc/pdf
doc/*.idx
/web/upload
/build/*
Expand Down Expand Up @@ -66,7 +66,7 @@ testament.db
/tests/**/*.js
/csources
/dist/
/lib/fusion
# /lib/fusion # fusion is now unbundled; `git status` should reveal if it's there so users can act on it

# Private directories and files (IDEs)
.*/
Expand Down Expand Up @@ -100,3 +100,5 @@ htmldocs

## these are not needed anymore unless checkout old older versions
nimdoc.out.css
# except here:
!/nimdoc/testproject/expected/*
2 changes: 1 addition & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ test-windows:
script:
- call ci\deps.bat
- nim c testament\tester
- testament\tester.exe --pedantic all
- testament\tester.exe all
tags:
- windows
- fast
File renamed without changes.
Loading

0 comments on commit 4c122d1

Please sign in to comment.