Skip to content

Commit

Permalink
Merge pull request #7 from ful1e5/dev
Browse files Browse the repository at this point in the history
GoogleDot v1.0.1 πŸš€
  • Loading branch information
ful1e5 authored Feb 17, 2021
2 parents 61ef63e + d00499d commit f00f34f
Show file tree
Hide file tree
Showing 132 changed files with 3,283 additions and 1,836 deletions.
158 changes: 68 additions & 90 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,95 +1,73 @@
name: build

on:
push:
paths-ignore:
- "**.md"
- "**.bbcode"
- LICENSE
branches: [main, dev]

pull_request:
paths-ignore:
- "**.md"
- "**.bbcode"
- LICENSE
branches: [main]
push:
paths-ignore:
- "**.md"
- "**.bbcode"
- LICENSE
branches: [main, dev]
pull_request:
paths-ignore:
- "**.md"
- "**.bbcode"
- LICENSE
branches: [main]

jobs:
build:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2

- name: Install build dependencies (apt)
run: |
sudo apt install libx11-dev libxcursor-dev libpng-dev
continue-on-error: false

- name: Get yarn cache directory path
id: yarn-cache-dir-path
run: echo "::set-output name=dir::$(yarn cache dir)"

- uses: actions/cache@v2
id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
with:
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
${{ runner.os }}-yarn-
- uses: actions/setup-node@v1
with:
node-version: "12.x"
- run: yarn install
- run: yarn render

- name: Set up Python
uses: actions/setup-python@v2
with:
python-version: "3.x"

- name: Cache pip dependencies
uses: actions/cache@v2
with:
# This path is specific to Ubuntu
path: ~/.cache/pip
# Look to see if there is a cache hit for the corresponding requirements file
key: ${{ runner.os }}-pip-${{ hashFiles('requirements.txt') }}
restore-keys: |
${{ runner.os }}-pip-
${{ runner.os }}-
- name: Install pip dependencies
run: |
python -m pip install --upgrade pip
if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
continue-on-error: false

- name: Generating `GoogleDot` Cursor Theme
run: python build.py

- name: Compressing Artifacts
run: |
tar -cvzf logs.tar.gz build.log
tar -cvzf bitmaps.tar.gz bitmaps
tar -cvzf GoogleDot.tar.gz themes
- name: Uploading `GoogleDot` Build Log artifact
uses: actions/upload-artifact@v2
with:
name: logs
path: logs.tar.gz

- name: Uploading `bitmaps` artifact
uses: actions/upload-artifact@v2
with:
name: bitmaps
path: bitmaps.tar.gz

- name: Uploading `GoogleDot` Theme artifact
uses: actions/upload-artifact@v2
with:
name: GoogleDot
path: GoogleDot.tar.gz
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Install build dependencies (apt)
run: sudo apt install -y libx11-dev libxcursor-dev libpng-dev
continue-on-error: false
- name: Get yarn cache directory path
id: yarn-cache-dir-path
run: echo "::set-output name=dir::$(yarn cache dir)"
- name: Caching yarn packages
uses: actions/cache@v2
id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
with:
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
${{ runner.os }}-yarn-
- name: Set Up NodeJS 12.x
uses: actions/setup-node@v1
with:
node-version: "12.x"
- name: Caching pip packages
uses: actions/cache@v2
id: pip-cache # use this to check for `cache-hit` (`steps.pip-cache.outputs.cache-hit != 'true'`)
with:
path: ~/.cache/pip
key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
restore-keys: |
${{ runner.os }}-pip-
- name: Set up Python 3.8
uses: actions/setup-python@v2
with:
python-version: "3.8"
- name: Generating `GoogleDot` Cursor Theme
run: make
continue-on-error: false

- name: Compressing UNIX theme
run: tar -cvzf GoogleDot.tar.gz themes/GoogleDot

- name: Uploading `bitmaps` artifact
uses: actions/upload-artifact@v2
with:
name: bitmaps
path: bitmaps/*
- name: Uploading `GoogleDot` UNIX Theme artifact
uses: actions/upload-artifact@v2
with:
name: GoogleDot
path: GoogleDot.tar.gz
- name: Uploading `GoogleDot` Windows Theme artifact
uses: actions/upload-artifact@v2
with:
name: GoogleDot_Windows
path: themes/GoogleDot_Windows/*
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
########## Custom
bitmaps
themes
builder/files.txt

########## Python

Expand Down Expand Up @@ -252,4 +253,4 @@ dist
.yarn/unplugged
.yarn/build-state.yml
.yarn/install-state.gz
.pnp.*
.pnp.*
27 changes: 23 additions & 4 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,32 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [unreleased]

## [v1.0.1] - 17 Feb 2021

### Added

- Figma file added inside **README.md**
- Organized build & bitmaps source code
- Add **Make** compatibility
- Only build options added in `Makefile`
- Relinked few svg files for Windows cursors purpose
- New build docs

### Changed

- Fixed some linting problems of builder using `pylint`
- Reduced Package Size
- Customize sizes from `make`
- CI workflow `build` compatibility with `make` commands

## [v1.0.0] - 27 Oct 2020

### Added

- Initial release 🎊
- Logo and badges
- CI/CD Pipelines
- Initial release 🎊
- Logo and badges
- CI/CD Pipelines

[unreleased]: https://github.com/ful1e5/Google_Cursor/compare/v1.0.0...main
[unreleased]: https://github.com/ful1e5/Google_Cursor/compare/v1.0.1...main
[v1.0.1]: https://github.com/ful1e5/Google_Cursor/compare/v1.0.0...v1.0.1
[v1.0.0]: https://github.com/ful1e5/Google_Cursor/tree/v1.0.0
53 changes: 53 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
theme := GoogleDot
src := ./themes/$(theme)

local := ~/.icons
local_dest := $(local)/$(theme)

root := /usr/share/icons
root_dest := $(root)/$(theme)

all: clean render build

unix: clean render bitmaps
@cd builder && make build_unix

windows: clean render bitmaps
@cd builder && make build_windows

.PHONY: all

clean:
@rm -rf bitmaps themes

render: bitmapper svg
@cd bitmapper && $(MAKE)

build: bitmaps
@cd builder && $(MAKE)

.ONESHELL:
SHELL:=/bin/bash


install: $(src)
@if [[ $EUID -ne 0 ]]; then
@echo "> Installing '$(theme)' cursors inside $(local)/..."
@mkdir -p $(local)
@cp -r $(src) $(local_dest) && echo "> Installed!"
@else
@echo "> Installing '$(theme)' cursors inside $(root)/..."
@mkdir -p $(root)
@sudo cp -r $(src) $(root_dest) && echo "> Installed!"
@fi

uninstall:
@if [[ $EUID -ne 0 ]]; then
@echo "> Removing '$(local_dest)'..."
@rm -rf $(local_dest)
@else
@echo "> Removing '$(root_dest)'..."
@sudo rm -rf $(root_dest)
@fi

reinstall: uninstall install
Loading

0 comments on commit f00f34f

Please sign in to comment.