aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--.github/workflows/release.yml30
-rw-r--r--src/Makefile10
2 files changed, 22 insertions, 18 deletions
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 288b997d..412e4cb9 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -36,23 +36,12 @@ jobs:
with:
repository: orbitalquark/textadept-build
path: textadept-build
- - name: Checkout textadept-modules
- uses: actions/checkout@v2
- with:
- repository: orbitalquark/textadept-modules
- path: textadept-modules
- name: Build
id: build
shell: bash
run: |
# Move cached dependencies into src/.
- mv textadept-build/* src
- rm -r textadept-build
-
- # Temporarily zip up modules since anything named "textadept*" in root
- # is deleted by "make clean".
- zip -r src/textadept.modules.zip textadept-modules
- rm -r textadept-modules
+ mv textadept-build/* src && rm -r textadept-build
# Build.
if [[ ${{ github.event_name }} != schedule ]]; then
@@ -74,9 +63,20 @@ jobs:
sed 's/[^_]\+_\(.\+\)\.[^.]\+\.zip/\1/;'`
fi
echo "::set-output name=version::$version"
-
- # Rename and sign modules zip now that the version is known.
- mv src/textadept.modules.zip src/textadept_$version.modules.zip
+ - name: Package modules
+ shell: bash
+ run: |
+ mkdir textadept-modules
+ modules="css ctags debugger export file_diff html lsp lua_repl \
+ open_file_mode python rest ruby spellcheck yaml"
+ for module in $modules; do
+ gh_name="`echo -n $module | sed -e 's/_/-/g;'`"
+ gh_prefix="https://github.com/orbitalquark/textadept-$gh_name"
+ wget $gh_prefix/releases/download/latest/$module.zip
+ unzip -d textadept-modules $module.zip
+ done
+ zip -r src/textadept_${{ steps.build.outputs.version }}.modules.zip \
+ textadept-modules
- name: Upload artifacts
uses: actions/upload-artifact@v2
with:
diff --git a/src/Makefile b/src/Makefile
index 12e653b0..1bcafaa3 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -317,6 +317,8 @@ ifneq (, $(shell hg summary 2>/dev/null))
else
archive = cd ../ && git archive HEAD --prefix src/$(1)/ | tar -xf -
endif
+modules = css ctags debugger export file_diff html lsp lua_repl open_file_mode \
+ python rest ruby spellcheck yaml
$(basedir).linux: ; $(call archive,$@)
release: $(basedir).linux
@@ -344,9 +346,11 @@ osx-release: $(basedir).macOS
zip -r $<.zip $< && rm -rf $<
$(basedir).modules:
mkdir -p $@/modules
- hg archive -R /home/mitchell/code/textadept_modules/ -r tip $@/modules
-modules-release: $(basedir).modules
- zip -r $<.zip $< && rm -r $<
+ for module in $(modules); do \
+ make -C ../modules/$$module release; \
+ unzip -d $@/modules ../modules/$$module/$$module.zip; \
+ done
+modules-release: $(basedir).modules ; zip -r $<.zip $< && rm -r $<
osx-app: ../textadept ../textadept-curses ../scripts/osx/textadept_osx
mkdir -p $(osxapp_bin) $(osxapp_res)