Browse Source

Enable GitHub Actions and fix file URL behavior (#1232)

* Use GitHub Actions

* Fix unused imports on Windows

* Fix test for Windows

* Stop to run CI for i686-pc-windows-msvc for now

* Use `/` instead of `\` on Windows

* Add entry to changelog

* Prepare actix-files release
master
Yuki Okushi 9 months ago
committed by GitHub
parent
commit
f45db1f909
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 84 additions and 6 deletions
  1. +67
    -0
      .github/workflows/main.yml
  2. +4
    -0
      actix-files/CHANGES.md
  3. +1
    -1
      actix-files/Cargo.toml
  4. +3
    -2
      actix-files/src/lib.rs
  5. +9
    -3
      src/server.rs

+ 67
- 0
.github/workflows/main.yml View File

@@ -0,0 +1,67 @@
name: CI

on: [push, pull_request]

env:
VCPKGRS_DYNAMIC: 1

jobs:
build_and_test:
strategy:
fail-fast: false
matrix:
toolchain:
- x86_64-pc-windows-msvc
# - i686-pc-windows-msvc
- x86_64-apple-darwin
version:
- stable
- nightly
include:
- toolchain: x86_64-pc-windows-msvc
os: windows-latest
arch: x64
# - toolchain: i686-pc-windows-msvc
# os: windows-latest
# arch: x86
- toolchain: x86_64-apple-darwin
os: macOS-latest

name: ${{ matrix.version }} - ${{ matrix.toolchain }}
runs-on: ${{ matrix.os }}

steps:
- uses: actions/checkout@master

- name: Install ${{ matrix.version }}
uses: actions-rs/toolchain@v1
with:
toolchain: ${{ matrix.version }}-${{ matrix.toolchain }}
default: true

- name: Install OpenSSL
if: matrix.os == 'windows-latest'
run: |
vcpkg integrate install
vcpkg install openssl:${{ matrix.arch }}-windows

- name: check nightly
if: matrix.version == 'nightly'
uses: actions-rs/cargo@v1
with:
command: check
args: --all --benches --bins --examples --tests

- name: check stable
if: matrix.version == 'stable'
uses: actions-rs/cargo@v1
with:
command: check
args: --all --bins --examples --tests

- name: tests
if: matrix.toolchain != 'x86_64-pc-windows-gnu'
uses: actions-rs/cargo@v1
with:
command: test
args: --all --all-features -- --nocapture

+ 4
- 0
actix-files/CHANGES.md View File

@@ -1,5 +1,9 @@
# Changes

## [0.2.1] - 2019-12-22

* Use the same format for file URLs regardless of platforms

## [0.2.0] - 2019-12-20

* Fix BodyEncoding trait import #1220


+ 1
- 1
actix-files/Cargo.toml View File

@@ -1,6 +1,6 @@
[package]
name = "actix-files"
version = "0.2.0"
version = "0.2.1"
authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
description = "Static files support for actix web."
readme = "README.md"


+ 3
- 2
actix-files/src/lib.rs View File

@@ -155,7 +155,7 @@ impl Directory {
// show file url as relative to static path
macro_rules! encode_file_url {
($path:ident) => {
utf8_percent_encode(&$path.to_string_lossy(), CONTROLS)
utf8_percent_encode(&$path, CONTROLS)
};
}

@@ -178,7 +178,8 @@ fn directory_listing(
if dir.is_visible(&entry) {
let entry = entry.unwrap();
let p = match entry.path().strip_prefix(&dir.path) {
Ok(p) => base.join(p),
Ok(p) if cfg!(windows) => base.join(p).to_string_lossy().replace("\\", "/"),
Ok(p) => base.join(p).to_string_lossy().into_owned(),
Err(_) => continue,
};



+ 9
- 3
src/server.rs View File

@@ -3,16 +3,22 @@ use std::sync::{Arc, Mutex};
use std::{fmt, io, net};

use actix_http::{
body::MessageBody, Error, HttpService, KeepAlive, Protocol, Request, Response,
body::MessageBody, Error, HttpService, KeepAlive, Request, Response,
};
use actix_server::{Server, ServerBuilder};
use actix_service::{
map_config, pipeline_factory, IntoServiceFactory, Service, ServiceFactory,
map_config, IntoServiceFactory, Service, ServiceFactory,
};
use futures::future::ok;

use net2::TcpBuilder;

#[cfg(unix)]
use actix_http::Protocol;
#[cfg(unix)]
use actix_service::pipeline_factory;
#[cfg(unix)]
use futures::future::ok;

#[cfg(feature = "openssl")]
use actix_tls::openssl::{AlpnError, SslAcceptor, SslAcceptorBuilder};
#[cfg(feature = "rustls")]


Loading…
Cancel
Save