Skip to content

Commit

Permalink
Merge branch 'master' into nhz2-patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
nhz2 authored Oct 27, 2024
2 parents 3d36b7e + 07cb453 commit eb16db4
Show file tree
Hide file tree
Showing 9 changed files with 82 additions and 26 deletions.
61 changes: 61 additions & 0 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
name: CI

on:
push:
branches:
- master
pull_request:
branches:
- master

jobs:
test:
name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }}
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
version:
- '1.10'
- '1'
- 'pre'
os:
- ubuntu-latest
- windows-latest
arch:
- 'x64'
- 'x86'
include:
- os: ubuntu-latest
version: '1.6'
arch: x64
- os: ubuntu-latest
version: '1.6'
arch: x86
- os: macOS-13
version: '1'
arch: x64
- os: macOS-13
version: 'pre'
arch: x64
- os: macOS-14
version: '1'
arch: aarch64
- os: macOS-14
version: 'pre'
arch: aarch64
steps:
- uses: actions/checkout@v4
- uses: julia-actions/setup-julia@v2
with:
version: ${{ matrix.version }}
arch: ${{ matrix.arch }}
show-versioninfo: true
- uses: julia-actions/cache@v2
- uses: julia-actions/julia-buildpkg@v1
- uses: julia-actions/julia-runtest@v1
- uses: julia-actions/julia-processcoverage@v1
- uses: codecov/codecov-action@v4
with:
token: ${{ secrets.CODECOV_TOKEN }} # required
file: lcov.info
8 changes: 6 additions & 2 deletions .github/workflows/TagBot.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
name: TagBot
on:
schedule:
- cron: 0 * * * *
issue_comment:
types:
- created
workflow_dispatch:
jobs:
TagBot:
if: github.event_name == 'workflow_dispatch' || github.actor == 'JuliaTagBot'
runs-on: ubuntu-latest
steps:
- uses: JuliaRegistries/TagBot@v1
with:
token: ${{ secrets.GITHUB_TOKEN }}
ssh: ${{ secrets.DOCUMENTER_KEY }}
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
.DS_Store
/dev/
/Manifest.toml
Manifest.toml
11 changes: 0 additions & 11 deletions .travis.yml

This file was deleted.

12 changes: 1 addition & 11 deletions Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,4 @@ BufferedStreams = "1"
CodecBzip2 = "0.6, 0.7, 0.8"
SuffixArrays = "0.3, 1"
TranscodingStreams = "0.9.5, 0.10, 0.11"
julia = "1.3"

[extras]
Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
bsdiff_classic_jll = "7424abe3-9926-5da8-9b28-863d6330819c"
bsdiff_endsley_jll = "4b92dbe6-3cad-5173-b451-9946eb17ce71"
zrl_jll = "9fe51eb0-a099-5680-98c2-fe494cf0c162"

[targets]
test = ["Pkg", "Test", "bsdiff_classic_jll", "bsdiff_endsley_jll", "zrl_jll"]
julia = "1.6"
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# BSDiff

[![Build Status](https://travis-ci.org/JuliaIO/BSDiff.jl.svg?branch=master)](https://travis-ci.org/JuliaIO/BSDiff.jl)
[![Build Status](https://github.com/JuliaIO/BSDiff.jl/actions/workflows/CI.yml/badge.svg)](https://github.com/JuliaIO/BSDiff.jl/actions/workflows/CI.yml)
[![Codecov](https://codecov.io/gh/JuliaIO/BSDiff.jl/branch/master/graph/badge.svg)](https://codecov.io/gh/JuliaIO/BSDiff.jl)

The BSDiff package is a pure Julia implementation of the bsdiff tool for
Expand Down
File renamed without changes.
9 changes: 9 additions & 0 deletions test/Project.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
[deps]
Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
ArgTools = "0dad84c5-d112-42e6-8d28-ef12dabb789f"
BSDiff = "7b188ff4-8bb6-4dee-bbe1-9b6fdde2c7c5"
Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
bsdiff_classic_jll = "7424abe3-9926-5da8-9b28-863d6330819c"
bsdiff_endsley_jll = "4b92dbe6-3cad-5173-b451-9946eb17ce71"
zrl_jll = "9fe51eb0-a099-5680-98c2-fe494cf0c162"
3 changes: 3 additions & 0 deletions test/runtests.jl
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ import bsdiff_classic_jll
import bsdiff_endsley_jll
import zrl_jll

using Aqua: Aqua
Aqua.test_all(BSDiff)

const test_data = artifact"test_data"
const FORMATS = sort!(collect(keys(BSDiff.FORMATS)))

Expand Down

0 comments on commit eb16db4

Please sign in to comment.