Skip to content

Commit

Permalink
Merge branch '33-liquidation-github-actions'
Browse files Browse the repository at this point in the history
  • Loading branch information
mochi-sann committed Dec 18, 2022
2 parents 61bc2fa + 7330a70 commit e3d922d
Show file tree
Hide file tree
Showing 8 changed files with 21 additions and 182 deletions.
51 changes: 0 additions & 51 deletions .github/workflows/build.yml

This file was deleted.

12 changes: 6 additions & 6 deletions .github/workflows/node.js.yml → .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
# This workflow will do a clean installation of node dependencies, cache/restore them, build the source code and run tests across different versions of node
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions

name: Node.js CI
name: CI

on:
push:
branches: ["main"]
pull_request:
branches: ["main"]
env:
YARN_CACHE_FOLDER: .cache/yarn

jobs:
test:
runs-on: ubuntu-latest

strategy:
matrix:
node-version: [16.x]
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/
platform: [ubuntu-20.04]

runs-on: ${{ matrix.platform }}
steps:
- uses: actions/checkout@v3
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
cache: "yarn"
- uses: c-hive/gha-yarn-cache@v2
- run: yarn install
- run: TZ=Asia/Tokyo yarn test
50 changes: 0 additions & 50 deletions .github/workflows/publish.yml

This file was deleted.

46 changes: 12 additions & 34 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -1,52 +1,30 @@
name: "publish"
name: "build"
on:
push:
tags:
- app-v*
branches:
- main

env:
YARN_CACHE_FOLDER: .cache/yarn

jobs:
publish-tauri:
strategy:
fail-fast: false
matrix:
platform: [macos-latest, ubuntu-latest, windows-latest]

runs-on: ${{ matrix.platform }}
steps:
- uses: actions/checkout@v2
- name: setup node
uses: actions/setup-node@v2
uses: actions/setup-node@v1
with:
node-version: 16
- name: Get the version
id: get_version
run: echo ::set-output name=VERSION::__VERSION__
shell: bash
## https://github.com/tauri-apps/tauri/blob/76187298c1d52dc764c5192c6a770a65f44b82ab/.github/workflows/smoke-test-prod.yml
## Following that example, we cache directories for both cargo and node.
## The cache action will check caches before these directories are required, and update the caches if necessary
## at the end of the job (after cargo install and node install if those are necessary).
- name: cache rust bin
id: cache_rust_bin
uses: actions/cache@v1
with:
path: ~/.cargo/bin/
key: ${{ runner.OS }}-xbuild-bin-${{ hashFiles('**/Cargo.toml') }}
- name: cache rust registry/index
id: cache_rust_reg_index
uses: actions/cache@v1
with:
path: ~/.cargo/registry/index
key: ${{ runner.OS }}-xbuild-reg-index-${{ hashFiles('**/Cargo.toml') }}-
- name: cache rust registry/cache
id: cache_rust_reg_cache
uses: actions/cache@v1
with:
path: ~/.cargo/registry/cache/
key: ${{ runner.OS }}-xbuild-reg-cache-${{ hashFiles('**/Cargo.toml') }}-
- name: install Rust stable
uses: actions-rs/toolchain@v1
with:
toolchain: stable
profile: minimal
- name: install dependencies (ubuntu only)
if: matrix.platform == 'ubuntu-latest'
run: |
Expand All @@ -67,8 +45,8 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
releaseName: App v${{ steps.get_version.outputs.VERSION }}
tagName: app-v${{ steps.get_version.outputs.VERSION }}
tagName: app-v__VERSION__ # the action automatically replaces \_\_VERSION\_\_ with the app version
releaseName: "App v__VERSION__"
releaseBody: "See the assets to download this version and install."
releaseDraft: false
releaseDraft: true
prerelease: false
38 changes: 0 additions & 38 deletions .github/workflows/test-build.yml

This file was deleted.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "my-ical-class-timetable-generater",
"version": "0.1.0",
"version": "0.2.0",
"private": true,
"scripts": {
"dev": "next dev -p 3000",
Expand Down
2 changes: 1 addition & 1 deletion src-tauri/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src-tauri/tauri.conf.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
},
"package": {
"productName": "class2icall",
"version": "0.1.2"
"version": "0.2.0"
},
"tauri": {
"allowlist": {
Expand Down

0 comments on commit e3d922d

Please sign in to comment.