Skip to content

Commit e3cbd77

Browse files
authored
Merge pull request #14 from positron-solutions/finish-first-release
Finishing up first release
2 parents e5a993c + 05d3845 commit e3cbd77

13 files changed

+898
-741
lines changed

.github/workflows/ci.yml

+13-15
Original file line numberDiff line numberDiff line change
@@ -37,26 +37,24 @@ jobs:
3737
strategy:
3838
matrix:
3939
os: [ubuntu-latest, macos-latest]
40-
emacsPkg: [ emacs28,
41-
emacsUnstable,
42-
# emacsGit
43-
emacsNativeComp,
44-
emacs
40+
emacsPkg: [ emacs,
41+
emacsGit,
4542
]
4643
runs-on: ${{ matrix.os }}
4744

4845
steps:
49-
- uses: actions/checkout@v2.4.2
50-
- uses: cachix/install-nix-action@v15
46+
- uses: actions/checkout@v3.2.0
47+
- uses: cachix/install-nix-action@v18
5148
with:
5249
extra_nix_config: |
5350
access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
54-
- uses: cachix/cachix-action@v10
51+
- uses: cachix/cachix-action@v12
5552
with:
5653
# This CACHIX_AUTH_TOKEN & CACHIX_CACHE_NAME are secrets you must set
5754
# in your repository settings
5855
name: ${{ secrets.CACHIX_CACHE_NAME }}
5956
authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
57+
extraPullNames: nix-community # look for pre-built binaries from upstream
6058
# Some paths may confuse cachix. Add them with a pipe to the pushFilter
6159
pushFilter: "(.drv.chroot$)"
6260

@@ -72,18 +70,18 @@ jobs:
7270
if: matrix.emacsPkg == 'emacs' && matrix.os == 'ubuntu-latest'
7371
run: |
7472
eval "$(nix print-dev-env \
75-
--override-input nixpkgs github:nixos/nixpkgs/release-22.05 \
73+
--override-input nixpkgs github:nixos/nixpkgs/release-22.11 \
7674
--update-input emacs-overlay \
7775
.#${{ matrix.emacsPkg }})"
7876
7977
echo $PWD
8078
ls
8179
8280
# Lint the package
83-
emacs --script test/elisp-repo-kit-lint.el
81+
emacs --script test/run-shim.el -- lint
8482
8583
# Lint the tests
86-
emacs --script test/elisp-repo-kit-lint-tests.el
84+
emacs --script test/run-shim.el -- lint-tests
8785
8886
- name: run tests
8987
run: |
@@ -99,20 +97,20 @@ jobs:
9997
# print-dev-env
10098
if [[ $RUNNER_OS == Linux ]]; then
10199
eval "$(nix print-dev-env \
102-
--override-input nixpkgs github:nixos/nixpkgs/release-22.05 \
100+
--override-input nixpkgs github:nixos/nixpkgs/release-22.11 \
103101
--update-input emacs-overlay \
104102
.#${{ matrix.emacsPkg }})"
105103
106104
else
107105
eval "$(nix print-dev-env \
108-
--override-input nixpkgs github:nixos/nixpkgs/nixpkgs-22.05-darwin \
106+
--override-input nixpkgs github:nixos/nixpkgs/nixpkgs-22.11-darwin \
109107
--update-input emacs-overlay \
110108
.#${{ matrix.emacsPkg }})"
111109
fi
112110
113111
# Runs the tests in a graphical window (can freeze)
114-
# emacs --quick --load test/elisp-repo-kit-test-setup.el -- $GITHUB_SHA
112+
# emacs --quick --load test/run-shim.el -- test $GITHUB_SHA
115113
116114
# Run tests with terminal output and no graphical window
117115
ls test
118-
emacs --script test/elisp-repo-kit-test-setup.el -- $GITHUB_SHA
116+
emacs --script test/run-shim.el -- test $GITHUB_SHA

.github/workflows/dco.yml

+15-3
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,28 @@
2424
# The check is added as a shield to the project's README.org so that all can see
2525
# the license check for the entire commit history.
2626

27-
name: Developer Certificate of Origin Check
27+
name: DCO Check
2828

2929
on:
3030
pull_request:
3131
# any pull-request
3232
workflow_dispatch:
3333
# Allows you to run this workflow manually from the Actions tab
34-
34+
push:
35+
branches:
36+
- master
3537
jobs:
3638
check:
3739
runs-on: ubuntu-latest
3840
steps:
39-
- uses: tisonkun/actions-dco@v1.1
41+
- uses: actions/checkout@v3.2.0
42+
- name: Set up Python 3.10
43+
uses: actions/setup-python@v4
44+
with:
45+
python-version: '3.10'
46+
- name: Check DCO
47+
env:
48+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
49+
run: |
50+
pip3 install -U dco-check==0.3.1
51+
dco-check

.gitignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
.direnv/
22
**.elc
33
**.el~
4-
**/*autoloads.el
4+
**/*autoloads.el
5+
**trash

Makefile

-61
This file was deleted.

0 commit comments

Comments
 (0)