Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tweak rockspec to pass CI again #444

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Tweak rockspec to pass CI again #444

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4370a11
chore(ci): Bump Luacheck action, upstream now uses semver stable tag
alerque Aug 24, 2022
86f0379
chore(ci): Add workflow to test-build rockspec changes
alerque Aug 26, 2022
189393c
chore(build): Refactor rockspec to dodge luarocks 3.1.3 bug
alerque Aug 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/luacheck.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
name: Luacheck

on: [push, pull_request]
on: [ push, pull_request ]

jobs:

luacheck:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Luacheck
uses: lunarmodules/luacheck@v0
uses: lunarmodules/luacheck@v1
15 changes: 15 additions & 0 deletions .github/workflows/rockspec.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
name: Deploy

on: [ push, workflow_dispatch ]

jobs:

affected:
uses: lunarmodules/.github/.github/workflows/list_affected_rockspecs.yml@main

build:
needs: affected
if: ${{ needs.affected.outputs.rockspecs }}
uses: lunarmodules/.github/.github/workflows/test_build_rock.yml@main
with:
rockspecs: ${{ needs.affected.outputs.rockspecs }}
24 changes: 11 additions & 13 deletions penlight-dev-1.rockspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,16 @@
local package_name = "penlight"
local package_version = "dev"
local rockspec_revision = "1"
local github_account_name = "lunarmodules"
local github_repo_name = package_name
local git_checkout = package_version == "dev" and "master" or package_version

package = "penlight"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I prefer the vertical alignment of the "local"s, aesthetically. Despite this is just copying one variable into another.

(hence also the 2 lines white-space below to accentuate the vertical alignment above)

local rock_version = "dev"
local rock_release = "1"
local namespace = "lunarmodules"
local repository = package

rockspec_format = "3.0"
package = package_name
version = package_version .. "-" .. rockspec_revision
version = ("%s-%s"):format(rock_version, rock_release)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the concatenations are easier to read for non-Lua folks than the format-placeholder approach.


source = {
url = "git+https://github.com/"..github_account_name.."/"..github_repo_name..".git",
branch = git_checkout
url = ("git+https://github.com/%s/%s.git"):format(namespace, repository),
branch = rock_version == "dev" and "master" or nil,
tag = rock_version ~= "dev" and rock_version or nil,
Comment on lines +12 to +13
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this I like, I have switched other rockspecs to this as well. Wondering if it is worthwhile to remove the hardcoded "master" here and add a local at the top?

local default_branch = "master"

}

description = {
Expand All @@ -24,8 +22,8 @@ description = {
Much of the functionality is inspired by the Python standard libraries.
]],
license = "MIT/X11",
homepage = "https://"..github_account_name..".github.io/"..github_repo_name,
issues_url = "https://github.com/"..github_account_name.."/"..github_repo_name.."/issues",
homepage = ("https://%s.github.io/%s"):format(namespace, repository),
issues_url = ("https://github.com/%s/%s/issues"):format(namespace, repository),
maintainer = "[email protected]",
}

Expand Down