summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.forgejo/workflows/ci.yml24
-rw-r--r--.forgejo/workflows/release.yml34
-rw-r--r--.gitlab-ci.yml45
-rw-r--r--boxy.el8
-rw-r--r--tests/boxy-test-chinese.el4
-rw-r--r--tests/boxy-test-edge.el4
-rw-r--r--tests/boxy-test-margin.el4
-rw-r--r--tests/boxy-test-padding.el4
-rw-r--r--tests/boxy-test-setup.el4
-rw-r--r--tests/boxy-test-smoke.el4
-rw-r--r--tests/boxy-test-visual.el4
11 files changed, 76 insertions, 63 deletions
diff --git a/.forgejo/workflows/ci.yml b/.forgejo/workflows/ci.yml
new file mode 100644
index 0000000..e045451
--- /dev/null
+++ b/.forgejo/workflows/ci.yml
@@ -0,0 +1,24 @@
+on:
+ push:
+ branches:
+ - main
+jobs:
+ build:
+ runs-on: codeberg-tiny-lazy
+ container: silex/emacs:30-ci
+ steps:
+ - name: Checkout
+ run: |
+ git init -b main
+ git remote add origin $FORGEJO_SERVER_URL/$FORGEJO_REPOSITORY
+ git fetch origin $FORGEJO_SHA
+ git checkout --detach $FORGEJO_SHA
+ - name: Install dependencies
+ run: |
+ curl -fsSL https://raw.github.com/emacs-eldev/eldev/master/bin/eldev > eldev
+ chmod a+x eldev
+ - run: |
+ ./eldev doctor
+ ./eldev lint
+ ./eldev compile
+ ./eldev test
diff --git a/.forgejo/workflows/release.yml b/.forgejo/workflows/release.yml
new file mode 100644
index 0000000..1afb094
--- /dev/null
+++ b/.forgejo/workflows/release.yml
@@ -0,0 +1,34 @@
+on:
+ push:
+ tags:
+ - '*.*.*'
+jobs:
+ release:
+ runs-on: codeberg-tiny-lazy
+ container: silex/emacs:30-ci
+ steps:
+ - name: Install bullshit dependencies
+ run: |
+ curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.3/install.sh | bash
+ \. "$HOME/.nvm/nvm.sh"
+ nvm install --lts
+ ln -s "`type -p node`" /usr/bin/node
+ - uses: actions/checkout@v4
+ - name: Install actual dependencies
+ run: |
+ curl -fsSL https://raw.github.com/emacs-eldev/eldev/master/bin/eldev > eldev
+ chmod a+x eldev
+ - name: Package
+ run: |
+ ./eldev package
+ - name: Sign
+ run: |
+ cat << EOF | gpg --pinentry-mode loopback --passphrase ${{ secrets.STRAWBURSTER_PASSPHRASE }} --import
+ ${{ secrets.STRAWBURSTER_GPG_KEY }}
+ EOF
+ cd dist
+ ls | xargs -i{} gpg --pinentry-mode loopback --passphrase ${{ secrets.STRAWBURSTER_PASSPHRASE }} -ba -o {}.sig {}
+ - uses: actions/forgejo-release@v2.11.1
+ with:
+ direction: upload
+ release-dir: dist
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
deleted file mode 100644
index d12b341..0000000
--- a/.gitlab-ci.yml
+++ /dev/null
@@ -1,45 +0,0 @@
-stages:
- - build
- - release
-
-package:
- stage: build
- image: silex/emacs:29
- before_script:
- - curl -fsSL https://raw.github.com/doublep/eldev/master/webinstall/eldev | sh
- - export PATH="/root/.local/bin:$PATH"
- script:
- - eldev lint
- - eldev compile
- - eldev test
- - eldev package
- - eldev sha256
- artifacts:
- paths:
- - dist/
-
-release:
- stage: release
- only:
- - tags
- image: registry.gitlab.com/gitlab-org/release-cli:latest
- dependencies:
- - package
- variables:
- DIST_DIR: $CI_PROJECT_URL/-/jobs/$CI_JOB_ID/artifacts/raw/dist
- FILENAME_BASE: $CI_PROJECT_NAME-$CI_COMMIT_TAG
- release:
- tag_name: $CI_COMMIT_TAG
- description: $CI_COMMIT_DESCRIPTION
- assets:
- links:
- - name: $FILENAME_BASE.el
- url: $DIST_DIR/$FILENAME_BASE.el
- - name: $FILENAME_BASE.sha256.b32
- url: $DIST_DIR/$FILENAME_BASE.sha256.b32
- script:
- - echo Release job
- artifacts:
- paths:
- - dist/
- expire_in: never
diff --git a/boxy.el b/boxy.el
index ed021f8..9db7238 100644
--- a/boxy.el
+++ b/boxy.el
@@ -1,13 +1,13 @@
;;; boxy.el --- A boxy layout framework -*- lexical-binding: t -*-
-;; Copyright (C) 2021-2025 Free Software Foundation, Inc.
+;; Copyright (C) 2021-2026 Free Software Foundation, Inc.
-;; Author: Amy Grinn <grinn.amy@gmail.com>
-;; Version: 2.0.0
+;; Author: Amy Pillow <amypillow@lavache.com>
+;; Version: 2.0.1
;; File: boxy.el
;; Package-Requires: ((emacs "26.1"))
;; Keywords: tools
-;; URL: https://gitlab.com/grinn.amy/boxy
+;; URL: https://codeberg.org/strawburster/boxy
;; This program is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
diff --git a/tests/boxy-test-chinese.el b/tests/boxy-test-chinese.el
index c14cefe..6c63147 100644
--- a/tests/boxy-test-chinese.el
+++ b/tests/boxy-test-chinese.el
@@ -1,8 +1,8 @@
;;; boxy-test-chinese.el --- Chinese test cases for boxy -*- lexical-binding: t -*-
-;; Copyright (C) 2021-2023 Free Software Foundation, Inc.
+;; Copyright (C) 2021-2026 Free Software Foundation, Inc.
-;; Author: Amy Grinn <grinn.amy@gmail.com>
+;; Author: Amy Pillow <amypillow@lavache.com>
;;; Code:
diff --git a/tests/boxy-test-edge.el b/tests/boxy-test-edge.el
index 504fca2..54340e4 100644
--- a/tests/boxy-test-edge.el
+++ b/tests/boxy-test-edge.el
@@ -1,8 +1,8 @@
;;; boxy-test-edge-cases.el --- Edge cases for boxy -*- lexical-binding: t -*-
-;; Copyright (C) 2021-2023 Free Software Foundation, Inc.
+;; Copyright (C) 2021-2026 Free Software Foundation, Inc.
-;; Author: Amy Grinn <grinn.amy@gmail.com>
+;; Author: Amy Pillow <amypillow@lavache.com>
;;; Code:
diff --git a/tests/boxy-test-margin.el b/tests/boxy-test-margin.el
index 132eaf9..606ca75 100644
--- a/tests/boxy-test-margin.el
+++ b/tests/boxy-test-margin.el
@@ -1,8 +1,8 @@
;;; boxy-test-margin.el -- Margin tests for boxy -*- lexical-binding: t -*-
-;; Copyright (C) 2021-2023 Free Software Foundation, Inc.
+;; Copyright (C) 2021-2026 Free Software Foundation, Inc.
-;; Author: Amy Grinn <grinn.amy@gmail.com>
+;; Author: Amy Pillow <amypillow@lavache.com>
;;; Code:
diff --git a/tests/boxy-test-padding.el b/tests/boxy-test-padding.el
index d8dec1c..56273a5 100644
--- a/tests/boxy-test-padding.el
+++ b/tests/boxy-test-padding.el
@@ -1,8 +1,8 @@
;;; boxy-test-padding.el -- Padding tests for boxy -*- lexical-binding: t -*-
-;; Copyright (C) 2021-2023 Free Software Foundation, Inc.
+;; Copyright (C) 2021-2026 Free Software Foundation, Inc.
-;; Author: Amy Grinn <grinn.amy@gmail.com>
+;; Author: Amy Pillow <amypillow@lavache.com>
;;; Code:
diff --git a/tests/boxy-test-setup.el b/tests/boxy-test-setup.el
index 8064233..c6993da 100644
--- a/tests/boxy-test-setup.el
+++ b/tests/boxy-test-setup.el
@@ -1,8 +1,8 @@
;;; boxy-test-setup.el --- Set up for boxy tests -*- lexical-binding: t -*-
-;; Copyright (C) 2021-2023 Free Software Foundation, Inc.
+;; Copyright (C) 2021-2026 Free Software Foundation, Inc.
-;; Author: Amy Grinn <grinn.amy@gmail.com>
+;; Author: Amy Pillow <amypillow@lavache.com>
;;; Code:
diff --git a/tests/boxy-test-smoke.el b/tests/boxy-test-smoke.el
index 7e12c07..9634313 100644
--- a/tests/boxy-test-smoke.el
+++ b/tests/boxy-test-smoke.el
@@ -1,8 +1,8 @@
;;; boxy-test-smoke.el -- Smoke tests for boxy -*- lexical-binding: t -*-
-;; Copyright (C) 2021-2023 Free Software Foundation, Inc.
+;; Copyright (C) 2021-2026 Free Software Foundation, Inc.
-;; Author: Amy Grinn <grinn.amy@gmail.com>
+;; Author: Amy Pillow <amypillow@lavache.com>
;;; Code:
diff --git a/tests/boxy-test-visual.el b/tests/boxy-test-visual.el
index 8f3a81b..21b415c 100644
--- a/tests/boxy-test-visual.el
+++ b/tests/boxy-test-visual.el
@@ -1,8 +1,8 @@
;;; boxy-test-visual.el --- Visual tests for boxy -*- lexical-binding: t -*-
-;; Copyright (C) 2021-2023 Free Software Foundation, Inc.
+;; Copyright (C) 2021-2026 Free Software Foundation, Inc.
-;; Author: Amy Grinn <grinn.amy@gmail.com>
+;; Author: Amy Pillow <amypillow@lavache.com>
;;; Commentary:
;;
generated by cgit v1.0 at 2026-05-28 20:47:47 +0000