Update GitHub workflows and Makefile

ofou · Mar 29, 2024 · 35e14f7 · 35e14f7
1 parent a9ce7a4
commit 35e14f7
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -2,9 +2,9 @@ name: macOS
 
 on:
   push:
-    branches: [ main ]
+    branches: [main]
   pull_request:
-    branches: [ main ]
+    branches: [main]
 
   workflow_dispatch:
 

diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
@@ -6,12 +6,14 @@ on:
   pull_request:
     branches: [main]
 
+  workflow_dispatch:
+
 jobs:
   build:
     runs-on: ubuntu-latest
 
     steps:
       - uses: actions/checkout@v2
-      - name: Testing on ubuntu-latest
+      - name: Run
         run: |
           make all
diff --git a/Makefile b/Makefile
@@ -2,14 +2,15 @@ SHELL := /bin/bash
 
 .SILENT: clean venv fetch merge epub pdf
 
-# Define OS-specific package manager and virtual environment activation command
 UNAME_S := $(shell uname -s)
-ifeq ($(UNAME_S),Linux)
-	PKG_MANAGER := apt
-	VENV_ACTIVATE := . ./.venv/bin/activate
+ifeq ($(UNAME_S),Darwin)
+PKG_MANAGER := brew
+VENV_ACTIVATE := source .venv/bin/activate
+else ifeq ($(UNAME_S),Linux)
+PKG_MANAGER := apt
+VENV_ACTIVATE := . ./.venv/bin/activate
 else
-	PKG_MANAGER := brew
-	VENV_ACTIVATE := . ./.venv/bin/activate
+$(error Unsupported operating system: $(UNAME_S))
 endif
 
 all: dependencies clean venv fetch merge epub wordcount