Skip to content

Commit

Permalink
Merge pull request #14 from positron-solutions/finish-first-release
Browse files Browse the repository at this point in the history
Finishing up first release
  • Loading branch information
psionic-k authored Dec 16, 2022
2 parents e5a993c + 05d3845 commit e3cbd77
Show file tree
Hide file tree
Showing 13 changed files with 898 additions and 741 deletions.
28 changes: 13 additions & 15 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,26 +37,24 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, macos-latest]
emacsPkg: [ emacs28,
emacsUnstable,
# emacsGit
emacsNativeComp,
emacs
emacsPkg: [ emacs,
emacsGit,
]
runs-on: ${{ matrix.os }}

steps:
- uses: actions/checkout@v2.4.2
- uses: cachix/install-nix-action@v15
- uses: actions/checkout@v3.2.0
- uses: cachix/install-nix-action@v18
with:
extra_nix_config: |
access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
- uses: cachix/cachix-action@v10
- uses: cachix/cachix-action@v12
with:
# This CACHIX_AUTH_TOKEN & CACHIX_CACHE_NAME are secrets you must set
# in your repository settings
name: ${{ secrets.CACHIX_CACHE_NAME }}
authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
extraPullNames: nix-community # look for pre-built binaries from upstream
# Some paths may confuse cachix. Add them with a pipe to the pushFilter
pushFilter: "(.drv.chroot$)"

Expand All @@ -72,18 +70,18 @@ jobs:
if: matrix.emacsPkg == 'emacs' && matrix.os == 'ubuntu-latest'
run: |
eval "$(nix print-dev-env \
--override-input nixpkgs github:nixos/nixpkgs/release-22.05 \
--override-input nixpkgs github:nixos/nixpkgs/release-22.11 \
--update-input emacs-overlay \
.#${{ matrix.emacsPkg }})"
echo $PWD
ls
# Lint the package
emacs --script test/elisp-repo-kit-lint.el
emacs --script test/run-shim.el -- lint
# Lint the tests
emacs --script test/elisp-repo-kit-lint-tests.el
emacs --script test/run-shim.el -- lint-tests
- name: run tests
run: |
Expand All @@ -99,20 +97,20 @@ jobs:
# print-dev-env
if [[ $RUNNER_OS == Linux ]]; then
eval "$(nix print-dev-env \
--override-input nixpkgs github:nixos/nixpkgs/release-22.05 \
--override-input nixpkgs github:nixos/nixpkgs/release-22.11 \
--update-input emacs-overlay \
.#${{ matrix.emacsPkg }})"
else
eval "$(nix print-dev-env \
--override-input nixpkgs github:nixos/nixpkgs/nixpkgs-22.05-darwin \
--override-input nixpkgs github:nixos/nixpkgs/nixpkgs-22.11-darwin \
--update-input emacs-overlay \
.#${{ matrix.emacsPkg }})"
fi
# Runs the tests in a graphical window (can freeze)
# emacs --quick --load test/elisp-repo-kit-test-setup.el -- $GITHUB_SHA
# emacs --quick --load test/run-shim.el -- test $GITHUB_SHA
# Run tests with terminal output and no graphical window
ls test
emacs --script test/elisp-repo-kit-test-setup.el -- $GITHUB_SHA
emacs --script test/run-shim.el -- test $GITHUB_SHA
18 changes: 15 additions & 3 deletions .github/workflows/dco.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,28 @@
# The check is added as a shield to the project's README.org so that all can see
# the license check for the entire commit history.

name: Developer Certificate of Origin Check
name: DCO Check

on:
pull_request:
# any pull-request
workflow_dispatch:
# Allows you to run this workflow manually from the Actions tab

push:
branches:
- master
jobs:
check:
runs-on: ubuntu-latest
steps:
- uses: tisonkun/[email protected]
- uses: actions/[email protected]
- name: Set up Python 3.10
uses: actions/setup-python@v4
with:
python-version: '3.10'
- name: Check DCO
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
pip3 install -U dco-check==0.3.1
dco-check
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
.direnv/
**.elc
**.el~
**/*autoloads.el
**/*autoloads.el
**trash
61 changes: 0 additions & 61 deletions Makefile

This file was deleted.

Loading

0 comments on commit e3cbd77

Please sign in to comment.