Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

upgrade CI, repair broken links #15

Merged
merged 7 commits into from
May 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions .github/pipeline
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
swift --version &&
swift run -c release Base64Tests &&
swift run -c release CRCTests &&
swift run -c release SHA2Tests
#!/bin/bash
set -e
swift --version
swift build -c release
for f in .build/release/*Tests; do
$f
done
25 changes: 0 additions & 25 deletions .github/workflows/build-devices.yml

This file was deleted.

30 changes: 0 additions & 30 deletions .github/workflows/build-windows.yml

This file was deleted.

97 changes: 0 additions & 97 deletions .github/workflows/build.yml

This file was deleted.

73 changes: 73 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
name: build

on:
push:
branches: [ master ]
pull_request:
branches: [ master ]

jobs:
linux:
runs-on: ubuntu-22.04
name: Amazon Linux 2023

strategy:
matrix:
image:
- tayloraswift/5.10.0-amazonlinux2023:latest
steps:
- name: Checkout repository
uses: actions/checkout@v3

- name: Run pipeline
run: |
docker run -t --rm \
--name swift-environment \
--user root \
-v $PWD:/swift-hash \
-w /swift-hash \
${{ matrix.image }} \
.github/pipeline

macos:
runs-on: macos-14
name: macOS
env:
DEVELOPER_DIR: "/Applications/Xcode_15.3.app/Contents/Developer"

steps:
- name: Checkout repository
uses: actions/checkout@v3

- name: Build iOS
run: |
swift --version
xcrun xcodebuild build -scheme "CRC" -destination \
"generic/platform=ios"
xcrun xcodebuild build -scheme "SHA2" -destination \
"generic/platform=ios"
xcrun xcodebuild build -scheme "Base64" -destination \
"generic/platform=ios"

- name: Build tvOS
run: |
swift --version
xcrun xcodebuild build -scheme "CRC" -destination \
"generic/platform=tvos"
xcrun xcodebuild build -scheme "SHA2" -destination \
"generic/platform=tvos"
xcrun xcodebuild build -scheme "Base64" -destination \
"generic/platform=tvos"

- name: Build watchOS
run: |
swift --version
xcrun xcodebuild build -scheme "CRC" -destination \
"generic/platform=watchos"
xcrun xcodebuild build -scheme "SHA2" -destination \
"generic/platform=watchos"
xcrun xcodebuild build -scheme "Base64" -destination \
"generic/platform=watchos"

- name: Run pipeline
run: .github/pipeline
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
.build
.build.ssgc
.build.unidoc
.vscode
Packages/
2 changes: 2 additions & 0 deletions .mailmap
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Dianna Ma <[email protected]>
Dianna Ma <[email protected]>
9 changes: 0 additions & 9 deletions .spi.yml

This file was deleted.

2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright 2022 Kelvin Ma (@taylorswift)
Copyright 2024 Dianna Ma (@taylorswift)

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
12 changes: 6 additions & 6 deletions NOTICE
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
the `swift-hash` package was created by kelvin ma (@taylorswift).
the `swift-hash` package was created by Dianna Ma (@taylorswift).

you are welcome to contribute to this project at:
you are welcome to contribute to this project at:

https://github.com/kelvin13/swift-hash
https://github.com/tayloraswift/swift-hash

we do not maintain any other mirrors of this repository, and such
we do not maintain any other mirrors of this repository, and such
forks of this repository may not carry the most up-to-date code.

contributors:
contributors:

1. kelvin ma (@taylorswift, 2021–22)
1. Dianna Ma (@taylorswift, 2021–24)
10 changes: 5 additions & 5 deletions Package.resolved
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-atomics.git",
"state" : {
"revision" : "ff3d2212b6b093db7f177d0855adbc4ef9c5f036",
"version" : "1.0.3"
"revision" : "cd142fd2f64be2100422d658e7411e39489da985",
"version" : "1.2.0"
}
},
{
"identity" : "swift-grammar",
"kind" : "remoteSourceControl",
"location" : "https://github.com/kelvin13/swift-grammar",
"location" : "https://github.com/tayloraswift/swift-grammar",
"state" : {
"revision" : "69613825b2ad1d0538c59d72e548867ce7568cc2",
"version" : "0.3.1"
"revision" : "642d5957896f06b03e35c48fc439488367d3fd21",
"version" : "0.4.0"
}
}
],
Expand Down
Loading
Loading